You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@netbeans.apache.org by tm...@apache.org on 2021/01/19 03:19:29 UTC

[netbeans] branch master updated: [NETBEANS-4443] PHP 8.0 Support: Allow trailing comma in closure use lists

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/netbeans.git


The following commit(s) were added to refs/heads/master by this push:
     new bafa433  [NETBEANS-4443] PHP 8.0 Support: Allow trailing comma in closure use lists
     new 131d197  Merge pull request #2692 from junichi11/php80-trailing-comma-in-closure-use-lists
bafa433 is described below

commit bafa433561547488417470e9c577003c30edb530
Author: Junichi Yamamoto <ju...@apache.org>
AuthorDate: Mon Jan 18 23:46:02 2021 +0900

    [NETBEANS-4443] PHP 8.0 Support: Allow trailing comma in closure use lists
    
    https://issues.apache.org/jira/browse/NETBEANS-4443
    
    - https://wiki.php.net/rfc/trailing_comma_in_closure_use_list
    - Fix the parser
    - Add unit tests for the parser and the formatter
    - Fix the `PHP80UnhandledError`
---
 .../modules/php/editor/parser/ASTPHP5Parser.java   | 1550 ++++++++++----------
 .../modules/php/editor/parser/ASTPHP5Symbols.java  |    2 +-
 .../php/editor/parser/EncodedActionTable1.java     |  122 +-
 .../php/editor/parser/EncodedActionTable10.java    |  102 +-
 .../php/editor/parser/EncodedActionTable11.java    |   88 +-
 .../php/editor/parser/EncodedActionTable12.java    |   42 +-
 .../php/editor/parser/EncodedActionTable13.java    |   52 +-
 .../php/editor/parser/EncodedActionTable14.java    |   64 +-
 .../php/editor/parser/EncodedActionTable15.java    |  138 +-
 .../php/editor/parser/EncodedActionTable16.java    |   18 +-
 .../php/editor/parser/EncodedActionTable5.java     |   58 +-
 .../php/editor/parser/EncodedActionTable6.java     |   90 +-
 .../php/editor/parser/EncodedActionTable7.java     |   50 +-
 .../php/editor/parser/EncodedActionTable8.java     |   92 +-
 .../php/editor/parser/EncodedActionTable9.java     |   76 +-
 .../editor/verification/PHP80UnhandledError.java   |   71 +-
 .../allowTrailingCommaInClosureUseLists_01.pass    |  573 ++++++++
 .../allowTrailingCommaInClosureUseLists_01a.php    |   59 +
 ...railingCommaInClosureUseLists_01a.php.formatted |   66 +
 .../allowTrailingCommaInClosureUseLists_01b.php    |   59 +
 ...railingCommaInClosureUseLists_01b.php.formatted |   66 +
 .../allowTrailingCommaInClosureUseLists_01.php     |   56 +
 ...lowTrailingCommaInClosureUseLists_01.php.errors |    1 +
 .../php/editor/indent/PHPFormatterTest.java        |   11 +
 .../php/editor/parser/ASTPHP5ParserTest.java       |    4 +
 .../php/editor/parser/PhpParserErrorTest.java      |    3 +
 php/php.editor/tools/ASTPHP5Parser.cup             |    2 +-
 27 files changed, 2208 insertions(+), 1307 deletions(-)

diff --git a/php/php.editor/src/org/netbeans/modules/php/editor/parser/ASTPHP5Parser.java b/php/php.editor/src/org/netbeans/modules/php/editor/parser/ASTPHP5Parser.java
index 981f3ab..3802786 100644
--- a/php/php.editor/src/org/netbeans/modules/php/editor/parser/ASTPHP5Parser.java
+++ b/php/php.editor/src/org/netbeans/modules/php/editor/parser/ASTPHP5Parser.java
@@ -19,7 +19,7 @@
 
 //----------------------------------------------------
 // The following code was generated by CUP v0.11a beta 20060608
-// Fri Jan 08 07:38:57 JST 2021
+// Mon Jan 18 23:35:12 JST 2021
 //----------------------------------------------------
 
 package org.netbeans.modules.php.editor.parser;
@@ -30,7 +30,7 @@ import org.netbeans.modules.php.editor.parser.astnodes.*;
 import org.openide.util.Pair;
 
 /** CUP v0.11a beta 20060608 generated parser.
-  * @version Fri Jan 08 07:38:57 JST 2021
+  * @version Mon Jan 18 23:35:12 JST 2021
   */
 @org.netbeans.api.annotations.common.SuppressWarnings({"EI_EXPOSE_REP", "MS_PKGPROTECT", "BC_BAD_CAST_TO_CONCRETE_COLLECTION"})
 public class ASTPHP5Parser extends java_cup.runtime.lr_parser {
@@ -191,7 +191,7 @@ public class ASTPHP5Parser extends java_cup.runtime.lr_parser {
     "\013\000\002\110\011\000\002\111\002\000\002\111\004" +
     "\000\002\112\003\000\002\112\005\000\002\113\006\000" +
     "\002\113\006\000\002\114\003\000\002\114\005\000\002" +
-    "\042\002\000\002\042\006\000\002\043\005\000\002\043" +
+    "\042\002\000\002\042\007\000\002\043\005\000\002\043" +
     "\006\000\002\043\003\000\002\043\004\000\002\065\006" +
     "\000\002\065\010\000\002\065\007\000\002\065\010\000" +
     "\002\065\010\000\002\065\012\000\002\065\010\000\002" +
@@ -290,7 +290,7 @@ public class ASTPHP5Parser extends java_cup.runtime.lr_parser {
   /** <code>reduce_goto</code> table. */
   protected static final short[][] _reduce_table =
     unpackFromStrings(new String[] {
-    "\000\u05c8\000\006\002\003\012\004\001\001\000\002\001" +
+    "\000\u05c9\000\006\002\003\012\004\001\001\000\002\001" +
     "\001\000\152\003\204\004\105\013\216\014\210\017\136" +
     "\062\177\063\130\064\163\065\052\070\135\074\016\100" +
     "\020\102\106\105\175\106\207\107\140\110\146\115\214" +
@@ -300,16 +300,16 @@ public class ASTPHP5Parser extends java_cup.runtime.lr_parser {
     "\026\225\055\241\201\243\122\244\006\246\022\251\142" +
     "\257\115\262\034\263\041\264\051\275\060\277\065\300" +
     "\152\303\141\001\001\000\002\001\001\000\002\001\001" +
-    "\000\002\001\001\000\006\050\u05ba\051\u05bd\001\001\000" +
+    "\000\002\001\001\000\006\050\u05bb\051\u05be\001\001\000" +
     "\002\001\001\000\122\003\204\004\105\062\177\063\130" +
-    "\064\163\065\052\070\135\074\016\100\u05b5\105\u05b6\106" +
-    "\u05b7\107\140\110\146\115\214\116\066\117\200\120\155" +
+    "\064\163\065\052\070\135\074\016\100\u05b6\105\u05b7\106" +
+    "\u05b8\107\140\110\146\115\214\116\066\117\200\120\155" +
     "\131\111\141\101\161\134\162\045\163\023\164\145\165" +
     "\103\166\061\167\114\171\073\212\024\241\201\243\122" +
     "\244\006\246\022\251\142\257\115\262\034\263\041\264" +
     "\051\275\060\277\065\300\227\001\001\000\002\001\001" +
     "\000\002\001\001\000\116\003\204\004\105\062\177\063" +
-    "\130\064\163\065\052\070\135\074\016\100\u0598\107\140" +
+    "\130\064\163\065\052\070\135\074\016\100\u0599\107\140" +
     "\110\146\115\214\116\066\117\200\120\155\131\111\141" +
     "\101\161\134\162\045\163\023\164\145\165\103\166\061" +
     "\167\114\171\073\212\024\241\201\243\122\244\006\246" +
@@ -317,96 +317,96 @@ public class ASTPHP5Parser extends java_cup.runtime.lr_parser {
     "\277\065\300\227\001\001\000\002\001\001\000\002\001" +
     "\001\000\002\001\001\000\002\001\001\000\002\001\001" +
     "\000\002\001\001\000\002\001\001\000\002\001\001\000" +
-    "\002\001\001\000\012\003\u056d\010\u056f\011\u0572\022\u031e" +
+    "\002\001\001\000\012\003\u056e\010\u0570\011\u0573\022\u031f" +
     "\001\001\000\116\003\204\004\105\062\177\063\130\064" +
-    "\163\065\052\070\135\074\016\100\u056c\107\140\110\146" +
+    "\163\065\052\070\135\074\016\100\u056d\107\140\110\146" +
     "\115\214\116\066\117\200\120\155\131\111\141\101\161" +
     "\134\162\045\163\023\164\145\165\103\166\061\167\114" +
     "\171\073\212\024\241\201\243\122\244\006\246\022\251" +
     "\142\257\115\262\034\263\041\264\051\275\060\277\065" +
-    "\300\227\001\001\000\012\003\331\171\u0563\301\u0562\302" +
-    "\u0564\001\001\000\116\003\204\004\105\062\177\063\130" +
-    "\064\163\065\052\070\135\074\016\100\u0561\107\140\110" +
+    "\300\227\001\001\000\012\003\331\171\u0564\301\u0563\302" +
+    "\u0565\001\001\000\116\003\204\004\105\062\177\063\130" +
+    "\064\163\065\052\070\135\074\016\100\u0562\107\140\110" +
     "\146\115\214\116\066\117\200\120\155\131\111\141\101" +
     "\161\134\162\045\163\023\164\145\165\103\166\061\167" +
     "\114\171\073\212\024\241\201\243\122\244\006\246\022" +
     "\251\142\257\115\262\034\263\041\264\051\275\060\277" +
-    "\065\300\227\001\001\000\002\001\001\000\004\122\u036d" +
+    "\065\300\227\001\001\000\002\001\001\000\004\122\u036e" +
     "\001\001\000\002\001\001\000\002\001\001\000\004\122" +
-    "\u0397\001\001\000\004\136\u0548\001\001\000\002\001\001" +
+    "\u0398\001\001\000\004\136\u0549\001\001\000\002\001\001" +
     "\000\116\003\204\004\105\062\177\063\130\064\163\065" +
-    "\052\070\135\074\016\100\u0547\107\140\110\146\115\214" +
+    "\052\070\135\074\016\100\u0548\107\140\110\146\115\214" +
     "\116\066\117\200\120\155\131\111\141\101\161\134\162" +
     "\045\163\023\164\145\165\103\166\061\167\114\171\073" +
     "\212\024\241\201\243\122\244\006\246\022\251\142\257" +
     "\115\262\034\263\041\264\051\275\060\277\065\300\227" +
     "\001\001\000\116\003\204\004\105\062\177\063\130\064" +
-    "\163\065\052\070\135\074\016\100\u0546\107\140\110\146" +
+    "\163\065\052\070\135\074\016\100\u0547\107\140\110\146" +
     "\115\214\116\066\117\200\120\155\131\111\141\101\161" +
     "\134\162\045\163\023\164\145\165\103\166\061\167\114" +
     "\171\073\212\024\241\201\243\122\244\006\246\022\251" +
     "\142\257\115\262\034\263\041\264\051\275\060\277\065" +
     "\300\227\001\001\000\002\001\001\000\002\001\001\000" +
     "\002\001\001\000\116\003\204\004\105\062\177\063\130" +
-    "\064\163\065\052\070\135\074\016\100\u051d\107\140\110" +
+    "\064\163\065\052\070\135\074\016\100\u051e\107\140\110" +
     "\146\115\214\116\066\117\200\120\155\131\111\141\101" +
     "\161\134\162\045\163\023\164\145\165\103\166\061\167" +
     "\114\171\073\212\024\241\201\243\122\244\006\246\022" +
     "\251\142\257\115\262\034\263\041\264\051\275\060\277" +
-    "\065\300\227\001\001\000\004\052\u0515\001\001\000\002" +
-    "\001\001\000\004\122\u0508\001\001\000\002\001\001\000" +
+    "\065\300\227\001\001\000\004\052\u0516\001\001\000\002" +
+    "\001\001\000\004\122\u0509\001\001\000\002\001\001\000" +
     "\002\001\001\000\002\001\001\000\002\001\001\000\002" +
-    "\001\001\000\002\001\001\000\004\122\u04e9\001\001\000" +
+    "\001\001\000\002\001\001\000\004\122\u04ea\001\001\000" +
     "\126\003\204\004\105\062\177\063\130\064\163\065\052" +
-    "\070\135\074\016\100\u0351\107\140\110\146\115\214\116" +
-    "\066\117\200\120\155\131\111\132\u04e5\133\u0352\134\u0354" +
-    "\135\u0353\141\101\161\134\162\045\163\023\164\145\165" +
+    "\070\135\074\016\100\u0352\107\140\110\146\115\214\116" +
+    "\066\117\200\120\155\131\111\132\u04e6\133\u0353\134\u0355" +
+    "\135\u0354\141\101\161\134\162\045\163\023\164\145\165" +
     "\103\166\061\167\114\171\073\212\024\241\201\243\122" +
     "\244\006\246\022\251\142\257\115\262\034\263\041\264" +
     "\051\275\060\277\065\300\227\001\001\000\054\003\u0113" +
     "\064\163\065\052\115\u0110\116\066\117\u010a\120\155\131" +
-    "\111\162\045\165\u010b\166\061\171\u010d\212\u03c4\243\u04e4" +
+    "\111\162\045\165\u010b\166\061\171\u010d\212\u03c5\243\u04e5" +
     "\244\006\246\022\251\142\262\034\263\041\264\051\275" +
     "\060\001\001\000\002\001\001\000\002\001\001\000\004" +
     "\122\u012c\001\001\000\002\001\001\000\116\003\204\004" +
     "\105\062\177\063\130\064\163\065\052\070\135\074\016" +
-    "\100\u04e2\107\140\110\146\115\214\116\066\117\200\120" +
+    "\100\u04e3\107\140\110\146\115\214\116\066\117\200\120" +
     "\155\131\111\141\101\161\134\162\045\163\023\164\145" +
     "\165\103\166\061\167\114\171\073\212\024\241\201\243" +
     "\122\244\006\246\022\251\142\257\115\262\034\263\041" +
     "\264\051\275\060\277\065\300\227\001\001\000\002\001" +
-    "\001\000\004\136\u04df\001\001\000\002\001\001\000\002" +
-    "\001\001\000\002\001\001\000\004\055\u04d4\001\001\000" +
+    "\001\000\004\136\u04e0\001\001\000\002\001\001\000\002" +
+    "\001\001\000\002\001\001\000\004\055\u04d5\001\001\000" +
     "\116\003\204\004\105\062\177\063\130\064\163\065\052" +
-    "\070\135\074\016\100\u04d3\107\140\110\146\115\214\116" +
+    "\070\135\074\016\100\u04d4\107\140\110\146\115\214\116" +
     "\066\117\200\120\155\131\111\141\101\161\134\162\045" +
     "\163\023\164\145\165\103\166\061\167\114\171\073\212" +
     "\024\241\201\243\122\244\006\246\022\251\142\257\115" +
     "\262\034\263\041\264\051\275\060\277\065\300\227\001" +
-    "\001\000\004\015\u04d1\001\001\000\002\001\001\000\004" +
-    "\003\u04d0\001\001\000\004\122\u0249\001\001\000\116\003" +
+    "\001\000\004\015\u04d2\001\001\000\002\001\001\000\004" +
+    "\003\u04d1\001\001\000\004\122\u0249\001\001\000\116\003" +
     "\204\004\105\062\177\063\130\064\163\065\052\070\135" +
-    "\074\016\100\u04cf\107\140\110\146\115\214\116\066\117" +
+    "\074\016\100\u04d0\107\140\110\146\115\214\116\066\117" +
     "\200\120\155\131\111\141\101\161\134\162\045\163\023" +
     "\164\145\165\103\166\061\167\114\171\073\212\024\241" +
     "\201\243\122\244\006\246\022\251\142\257\115\262\034" +
     "\263\041\264\051\275\060\277\065\300\227\001\001\000" +
-    "\004\122\u04ce\001\001\000\002\001\001\000\116\003\204" +
+    "\004\122\u04cf\001\001\000\002\001\001\000\116\003\204" +
     "\004\105\062\177\063\130\064\163\065\052\070\135\074" +
-    "\016\100\u04cc\107\140\110\146\115\214\116\066\117\200" +
+    "\016\100\u04cd\107\140\110\146\115\214\116\066\117\200" +
     "\120\155\131\111\141\101\161\134\162\045\163\023\164" +
     "\145\165\103\166\061\167\114\171\073\212\024\241\201" +
     "\243\122\244\006\246\022\251\142\257\115\262\034\263" +
     "\041\264\051\275\060\277\065\300\227\001\001\000\116" +
     "\003\204\004\105\062\177\063\130\064\163\065\052\070" +
-    "\135\074\016\100\u04cb\107\140\110\146\115\214\116\066" +
+    "\135\074\016\100\u04cc\107\140\110\146\115\214\116\066" +
     "\117\200\120\155\131\111\141\101\161\134\162\045\163" +
     "\023\164\145\165\103\166\061\167\114\171\073\212\024" +
     "\241\201\243\122\244\006\246\022\251\142\257\115\262" +
     "\034\263\041\264\051\275\060\277\065\300\227\001\001" +
-    "\000\010\116\u04ca\120\155\251\142\001\001\000\002\001" +
+    "\000\010\116\u04cb\120\155\251\142\001\001\000\002\001" +
     "\001\000\116\003\204\004\105\062\177\063\130\064\163" +
-    "\065\052\070\135\074\016\100\u04c7\107\140\110\146\115" +
+    "\065\052\070\135\074\016\100\u04c8\107\140\110\146\115" +
     "\214\116\066\117\200\120\155\131\111\141\101\161\134" +
     "\162\045\163\023\164\145\165\103\166\061\167\114\171" +
     "\073\212\024\241\201\243\122\244\006\246\022\251\142" +
@@ -414,36 +414,36 @@ public class ASTPHP5Parser extends java_cup.runtime.lr_parser {
     "\227\001\001\000\002\001\001\000\002\001\001\000\002" +
     "\001\001\000\046\003\331\115\322\116\316\117\313\120" +
     "\155\131\326\165\314\166\061\171\320\246\022\251\142" +
-    "\256\u04c5\261\310\262\311\263\325\264\312\277\065\300" +
-    "\340\001\001\000\002\001\001\000\004\003\u04b5\001\001" +
+    "\256\u04c6\261\310\262\311\263\325\264\312\277\065\300" +
+    "\340\001\001\000\002\001\001\000\004\003\u04b6\001\001" +
     "\000\002\001\001\000\002\001\001\000\002\001\001\000" +
     "\116\003\204\004\105\062\177\063\130\064\163\065\052" +
-    "\070\135\074\016\100\u0493\107\140\110\146\115\214\116" +
+    "\070\135\074\016\100\u0494\107\140\110\146\115\214\116" +
     "\066\117\200\120\155\131\111\141\101\161\134\162\045" +
     "\163\023\164\145\165\103\166\061\167\114\171\073\212" +
     "\024\241\201\243\122\244\006\246\022\251\142\257\115" +
     "\262\034\263\041\264\051\275\060\277\065\300\227\001" +
     "\001\000\002\001\001\000\116\003\204\004\105\062\177" +
-    "\063\130\064\163\065\052\070\135\074\016\100\u0492\107" +
+    "\063\130\064\163\065\052\070\135\074\016\100\u0493\107" +
     "\140\110\146\115\214\116\066\117\200\120\155\131\111" +
     "\141\101\161\134\162\045\163\023\164\145\165\103\166" +
     "\061\167\114\171\073\212\024\241\201\243\122\244\006" +
     "\246\022\251\142\257\115\262\034\263\041\264\051\275" +
     "\060\277\065\300\227\001\001\000\002\001\001\000\116" +
     "\003\204\004\105\062\177\063\130\064\163\065\052\070" +
-    "\135\074\016\100\u0491\107\140\110\146\115\214\116\066" +
+    "\135\074\016\100\u0492\107\140\110\146\115\214\116\066" +
     "\117\200\120\155\131\111\141\101\161\134\162\045\163" +
     "\023\164\145\165\103\166\061\167\114\171\073\212\024" +
     "\241\201\243\122\244\006\246\022\251\142\257\115\262" +
     "\034\263\041\264\051\275\060\277\065\300\227\001\001" +
-    "\000\002\001\001\000\004\055\u0488\001\001\000\002\001" +
-    "\001\000\002\001\001\000\002\001\001\000\004\136\u046e" +
+    "\000\002\001\001\000\004\055\u0489\001\001\000\002\001" +
+    "\001\000\002\001\001\000\002\001\001\000\004\136\u046f" +
     "\001\001\000\002\001\001\000\002\001\001\000\002\001" +
-    "\001\000\002\001\001\000\002\001\001\000\004\122\u03e2" +
+    "\001\000\002\001\001\000\002\001\001\000\004\122\u03e3" +
     "\001\001\000\002\001\001\000\002\001\001\000\002\001" +
     "\001\000\002\001\001\000\024\107\u02fc\143\143\210\126" +
-    "\211\160\223\171\224\026\225\055\277\u02d2\303\u044c\001" +
-    "\001\000\002\001\001\000\130\003\204\004\105\014\u042c" +
+    "\211\160\223\171\224\026\225\055\277\u02d2\303\u044d\001" +
+    "\001\000\002\001\001\000\130\003\204\004\105\014\u042d" +
     "\017\136\062\177\063\130\064\163\065\052\070\135\074" +
     "\016\100\020\102\106\105\175\106\207\107\140\110\146" +
     "\115\214\116\066\117\200\120\155\131\111\141\101\161" +
@@ -452,74 +452,74 @@ public class ASTPHP5Parser extends java_cup.runtime.lr_parser {
     "\142\257\115\262\034\263\041\264\051\275\060\277\065" +
     "\300\227\001\001\000\002\001\001\000\116\003\204\004" +
     "\105\062\177\063\130\064\163\065\052\070\135\074\016" +
-    "\100\u042a\107\140\110\146\115\214\116\066\117\200\120" +
+    "\100\u042b\107\140\110\146\115\214\116\066\117\200\120" +
     "\155\131\111\141\101\161\134\162\045\163\023\164\145" +
     "\165\103\166\061\167\114\171\073\212\024\241\201\243" +
     "\122\244\006\246\022\251\142\257\115\262\034\263\041" +
     "\264\051\275\060\277\065\300\227\001\001\000\120\003" +
-    "\204\004\105\057\u0425\062\177\063\130\064\163\065\052" +
-    "\070\135\074\016\100\u0424\107\140\110\146\115\214\116" +
+    "\204\004\105\057\u0426\062\177\063\130\064\163\065\052" +
+    "\070\135\074\016\100\u0425\107\140\110\146\115\214\116" +
     "\066\117\200\120\155\131\111\141\101\161\134\162\045" +
     "\163\023\164\145\165\103\166\061\167\114\171\073\212" +
     "\024\241\201\243\122\244\006\246\022\251\142\257\115" +
     "\262\034\263\041\264\051\275\060\277\065\300\227\001" +
     "\001\000\002\001\001\000\116\003\204\004\105\062\177" +
-    "\063\130\064\163\065\052\070\135\074\016\100\u0423\107" +
+    "\063\130\064\163\065\052\070\135\074\016\100\u0424\107" +
     "\140\110\146\115\214\116\066\117\200\120\155\131\111" +
     "\141\101\161\134\162\045\163\023\164\145\165\103\166" +
     "\061\167\114\171\073\212\024\241\201\243\122\244\006" +
     "\246\022\251\142\257\115\262\034\263\041\264\051\275" +
     "\060\277\065\300\227\001\001\000\116\003\204\004\105" +
     "\062\177\063\130\064\163\065\052\070\135\074\016\100" +
-    "\u0422\107\140\110\146\115\214\116\066\117\200\120\155" +
+    "\u0423\107\140\110\146\115\214\116\066\117\200\120\155" +
     "\131\111\141\101\161\134\162\045\163\023\164\145\165" +
     "\103\166\061\167\114\171\073\212\024\241\201\243\122" +
     "\244\006\246\022\251\142\257\115\262\034\263\041\264" +
     "\051\275\060\277\065\300\227\001\001\000\002\001\001" +
-    "\000\002\001\001\000\004\122\u03e6\001\001\000\002\001" +
-    "\001\000\004\122\u0403\001\001\000\002\001\001\000\002" +
+    "\000\002\001\001\000\004\122\u03e7\001\001\000\002\001" +
+    "\001\000\004\122\u0404\001\001\000\002\001\001\000\002" +
     "\001\001\000\116\003\204\004\105\062\177\063\130\064" +
-    "\163\065\052\070\135\074\016\100\u0402\107\140\110\146" +
+    "\163\065\052\070\135\074\016\100\u0403\107\140\110\146" +
     "\115\214\116\066\117\200\120\155\131\111\141\101\161" +
     "\134\162\045\163\023\164\145\165\103\166\061\167\114" +
     "\171\073\212\024\241\201\243\122\244\006\246\022\251" +
     "\142\257\115\262\034\263\041\264\051\275\060\277\065" +
     "\300\227\001\001\000\116\003\204\004\105\062\177\063" +
-    "\130\064\163\065\052\070\135\074\016\100\u0401\107\140" +
+    "\130\064\163\065\052\070\135\074\016\100\u0402\107\140" +
     "\110\146\115\214\116\066\117\200\120\155\131\111\141" +
     "\101\161\134\162\045\163\023\164\145\165\103\166\061" +
     "\167\114\171\073\212\024\241\201\243\122\244\006\246" +
     "\022\251\142\257\115\262\034\263\041\264\051\275\060" +
-    "\277\065\300\227\001\001\000\004\142\u03fe\001\001\000" +
-    "\002\001\001\000\120\003\204\004\105\062\u03f8\063\130" +
-    "\064\163\065\052\070\135\074\016\100\231\106\u03f9\107" +
+    "\277\065\300\227\001\001\000\004\142\u03ff\001\001\000" +
+    "\002\001\001\000\120\003\204\004\105\062\u03f9\063\130" +
+    "\064\163\065\052\070\135\074\016\100\231\106\u03fa\107" +
     "\140\110\146\115\214\116\066\117\200\120\155\131\111" +
     "\141\101\161\134\162\045\163\023\164\145\165\103\166" +
-    "\061\167\114\171\073\212\u03f7\241\201\243\122\244\006" +
+    "\061\167\114\171\073\212\u03f8\241\201\243\122\244\006" +
     "\246\022\251\142\257\115\262\034\263\041\264\051\275" +
     "\060\277\065\300\227\001\001\000\002\001\001\000\002" +
     "\001\001\000\002\001\001\000\002\001\001\000\004\066" +
-    "\u03ee\001\001\000\002\001\001\000\116\003\204\004\105" +
+    "\u03ef\001\001\000\002\001\001\000\116\003\204\004\105" +
     "\062\177\063\130\064\163\065\052\070\135\074\016\100" +
-    "\u03ec\107\140\110\146\115\214\116\066\117\200\120\155" +
+    "\u03ed\107\140\110\146\115\214\116\066\117\200\120\155" +
     "\131\111\141\101\161\134\162\045\163\023\164\145\165" +
     "\103\166\061\167\114\171\073\212\024\241\201\243\122" +
     "\244\006\246\022\251\142\257\115\262\034\263\041\264" +
     "\051\275\060\277\065\300\227\001\001\000\002\001\001" +
     "\000\002\001\001\000\002\001\001\000\124\003\204\004" +
     "\105\062\177\063\237\064\163\065\052\070\135\074\016" +
-    "\100\231\104\233\105\u03c8\106\u03c9\107\140\110\146\115" +
+    "\100\231\104\233\105\u03c9\106\u03ca\107\140\110\146\115" +
     "\214\116\066\117\200\120\155\131\111\141\101\161\134" +
     "\162\045\163\023\164\145\165\103\166\061\167\234\171" +
     "\073\212\232\241\240\243\122\244\006\246\022\251\142" +
     "\257\115\262\034\263\041\264\051\275\060\277\065\300" +
     "\227\001\001\000\002\001\001\000\054\003\u0113\064\163" +
     "\065\052\115\u0110\116\066\117\u010a\120\155\131\111\162" +
-    "\045\165\u010b\166\061\171\u010d\212\u03c4\243\u03c3\244\006" +
+    "\045\165\u010b\166\061\171\u010d\212\u03c5\243\u03c4\244\006" +
     "\246\022\251\142\262\034\263\041\264\051\275\060\001" +
     "\001\000\004\122\u0120\001\001\000\116\003\204\004\105" +
     "\062\177\063\130\064\163\065\052\070\135\074\016\100" +
-    "\u03c2\107\140\110\146\115\214\116\066\117\200\120\155" +
+    "\u03c3\107\140\110\146\115\214\116\066\117\200\120\155" +
     "\131\111\141\101\161\134\162\045\163\023\164\145\165" +
     "\103\166\061\167\114\171\073\212\024\241\201\243\122" +
     "\244\006\246\022\251\142\257\115\262\034\263\041\264" +
@@ -531,8 +531,8 @@ public class ASTPHP5Parser extends java_cup.runtime.lr_parser {
     "\165\103\166\061\167\114\171\073\212\024\241\201\243" +
     "\122\244\006\246\022\251\142\257\115\262\034\263\041" +
     "\264\051\275\060\277\065\300\227\001\001\000\002\001" +
-    "\001\000\004\122\u0397\001\001\000\002\001\001\000\002" +
-    "\001\001\000\004\055\u038c\001\001\000\006\107\u02fc\277" +
+    "\001\000\004\122\u0398\001\001\000\002\001\001\000\002" +
+    "\001\001\000\004\055\u038d\001\001\000\006\107\u02fc\277" +
     "\u02d2\001\001\000\120\003\204\004\105\062\177\063\237" +
     "\064\163\065\052\070\135\074\016\100\231\104\233\107" +
     "\140\110\146\115\214\116\066\117\200\120\155\131\111" +
@@ -542,7 +542,7 @@ public class ASTPHP5Parser extends java_cup.runtime.lr_parser {
     "\060\277\065\300\227\001\001\000\002\001\001\000\002" +
     "\001\001\000\002\001\001\000\002\001\001\000\046\003" +
     "\331\115\322\116\316\117\313\120\155\131\326\165\314" +
-    "\166\061\171\320\246\022\251\142\256\u0386\261\310\262" +
+    "\166\061\171\320\246\022\251\142\256\u0387\261\310\262" +
     "\311\263\325\264\312\277\065\300\340\001\001\000\116" +
     "\003\204\004\105\062\177\063\130\064\163\065\052\070" +
     "\135\074\016\100\241\107\140\110\146\115\214\116\066" +
@@ -552,124 +552,124 @@ public class ASTPHP5Parser extends java_cup.runtime.lr_parser {
     "\034\263\041\264\051\275\060\277\065\300\227\001\001" +
     "\000\002\001\001\000\002\001\001\000\002\001\001\000" +
     "\116\003\204\004\105\062\177\063\130\064\163\065\052" +
-    "\070\135\074\016\100\u0385\107\140\110\146\115\214\116" +
+    "\070\135\074\016\100\u0386\107\140\110\146\115\214\116" +
     "\066\117\200\120\155\131\111\141\101\161\134\162\045" +
     "\163\023\164\145\165\103\166\061\167\114\171\073\212" +
     "\024\241\201\243\122\244\006\246\022\251\142\257\115" +
     "\262\034\263\041\264\051\275\060\277\065\300\227\001" +
     "\001\000\116\003\204\004\105\062\177\063\130\064\163" +
-    "\065\052\070\135\074\016\100\u0384\107\140\110\146\115" +
+    "\065\052\070\135\074\016\100\u0385\107\140\110\146\115" +
     "\214\116\066\117\200\120\155\131\111\141\101\161\134" +
     "\162\045\163\023\164\145\165\103\166\061\167\114\171" +
     "\073\212\024\241\201\243\122\244\006\246\022\251\142" +
     "\257\115\262\034\263\041\264\051\275\060\277\065\300" +
     "\227\001\001\000\116\003\204\004\105\062\177\063\130" +
-    "\064\163\065\052\070\135\074\016\100\u0383\107\140\110" +
+    "\064\163\065\052\070\135\074\016\100\u0384\107\140\110" +
     "\146\115\214\116\066\117\200\120\155\131\111\141\101" +
     "\161\134\162\045\163\023\164\145\165\103\166\061\167" +
     "\114\171\073\212\024\241\201\243\122\244\006\246\022" +
     "\251\142\257\115\262\034\263\041\264\051\275\060\277" +
     "\065\300\227\001\001\000\116\003\204\004\105\062\177" +
-    "\063\130\064\163\065\052\070\135\074\016\100\u0382\107" +
+    "\063\130\064\163\065\052\070\135\074\016\100\u0383\107" +
     "\140\110\146\115\214\116\066\117\200\120\155\131\111" +
     "\141\101\161\134\162\045\163\023\164\145\165\103\166" +
     "\061\167\114\171\073\212\024\241\201\243\122\244\006" +
     "\246\022\251\142\257\115\262\034\263\041\264\051\275" +
     "\060\277\065\300\227\001\001\000\116\003\204\004\105" +
     "\062\177\063\130\064\163\065\052\070\135\074\016\100" +
-    "\u0381\107\140\110\146\115\214\116\066\117\200\120\155" +
+    "\u0382\107\140\110\146\115\214\116\066\117\200\120\155" +
     "\131\111\141\101\161\134\162\045\163\023\164\145\165" +
     "\103\166\061\167\114\171\073\212\024\241\201\243\122" +
     "\244\006\246\022\251\142\257\115\262\034\263\041\264" +
     "\051\275\060\277\065\300\227\001\001\000\116\003\204" +
     "\004\105\062\177\063\130\064\163\065\052\070\135\074" +
-    "\016\100\u0380\107\140\110\146\115\214\116\066\117\200" +
+    "\016\100\u0381\107\140\110\146\115\214\116\066\117\200" +
     "\120\155\131\111\141\101\161\134\162\045\163\023\164" +
     "\145\165\103\166\061\167\114\171\073\212\024\241\201" +
     "\243\122\244\006\246\022\251\142\257\115\262\034\263" +
     "\041\264\051\275\060\277\065\300\227\001\001\000\116" +
     "\003\204\004\105\062\177\063\130\064\163\065\052\070" +
-    "\135\074\016\100\u037f\107\140\110\146\115\214\116\066" +
+    "\135\074\016\100\u0380\107\140\110\146\115\214\116\066" +
     "\117\200\120\155\131\111\141\101\161\134\162\045\163" +
     "\023\164\145\165\103\166\061\167\114\171\073\212\024" +
     "\241\201\243\122\244\006\246\022\251\142\257\115\262" +
     "\034\263\041\264\051\275\060\277\065\300\227\001\001" +
     "\000\116\003\204\004\105\062\177\063\130\064\163\065" +
-    "\052\070\135\074\016\100\u037a\107\140\110\146\115\214" +
+    "\052\070\135\074\016\100\u037b\107\140\110\146\115\214" +
     "\116\066\117\200\120\155\131\111\141\101\161\134\162" +
     "\045\163\023\164\145\165\103\166\061\167\114\171\073" +
     "\212\024\241\201\243\122\244\006\246\022\251\142\257" +
     "\115\262\034\263\041\264\051\275\060\277\065\300\227" +
     "\001\001\000\116\003\204\004\105\062\177\063\130\064" +
-    "\163\065\052\070\135\074\016\100\u0379\107\140\110\146" +
+    "\163\065\052\070\135\074\016\100\u037a\107\140\110\146" +
     "\115\214\116\066\117\200\120\155\131\111\141\101\161" +
     "\134\162\045\163\023\164\145\165\103\166\061\167\114" +
     "\171\073\212\024\241\201\243\122\244\006\246\022\251" +
     "\142\257\115\262\034\263\041\264\051\275\060\277\065" +
     "\300\227\001\001\000\116\003\204\004\105\062\177\063" +
-    "\130\064\163\065\052\070\135\074\016\100\u0378\107\140" +
+    "\130\064\163\065\052\070\135\074\016\100\u0379\107\140" +
     "\110\146\115\214\116\066\117\200\120\155\131\111\141" +
     "\101\161\134\162\045\163\023\164\145\165\103\166\061" +
     "\167\114\171\073\212\024\241\201\243\122\244\006\246" +
     "\022\251\142\257\115\262\034\263\041\264\051\275\060" +
     "\277\065\300\227\001\001\000\116\003\204\004\105\062" +
-    "\177\063\130\064\163\065\052\070\135\074\016\100\u0377" +
+    "\177\063\130\064\163\065\052\070\135\074\016\100\u0378" +
     "\107\140\110\146\115\214\116\066\117\200\120\155\131" +
     "\111\141\101\161\134\162\045\163\023\164\145\165\103" +
     "\166\061\167\114\171\073\212\024\241\201\243\122\244" +
     "\006\246\022\251\142\257\115\262\034\263\041\264\051" +
     "\275\060\277\065\300\227\001\001\000\116\003\204\004" +
     "\105\062\177\063\130\064\163\065\052\070\135\074\016" +
-    "\100\u0376\107\140\110\146\115\214\116\066\117\200\120" +
+    "\100\u0377\107\140\110\146\115\214\116\066\117\200\120" +
     "\155\131\111\141\101\161\134\162\045\163\023\164\145" +
     "\165\103\166\061\167\114\171\073\212\024\241\201\243" +
     "\122\244\006\246\022\251\142\257\115\262\034\263\041" +
     "\264\051\275\060\277\065\300\227\001\001\000\116\003" +
     "\204\004\105\062\177\063\130\064\163\065\052\070\135" +
-    "\074\016\100\u0375\107\140\110\146\115\214\116\066\117" +
+    "\074\016\100\u0376\107\140\110\146\115\214\116\066\117" +
     "\200\120\155\131\111\141\101\161\134\162\045\163\023" +
     "\164\145\165\103\166\061\167\114\171\073\212\024\241" +
     "\201\243\122\244\006\246\022\251\142\257\115\262\034" +
     "\263\041\264\051\275\060\277\065\300\227\001\001\000" +
     "\116\003\204\004\105\062\177\063\130\064\163\065\052" +
-    "\070\135\074\016\100\u0374\107\140\110\146\115\214\116" +
+    "\070\135\074\016\100\u0375\107\140\110\146\115\214\116" +
     "\066\117\200\120\155\131\111\141\101\161\134\162\045" +
     "\163\023\164\145\165\103\166\061\167\114\171\073\212" +
     "\024\241\201\243\122\244\006\246\022\251\142\257\115" +
     "\262\034\263\041\264\051\275\060\277\065\300\227\001" +
     "\001\000\116\003\204\004\105\062\177\063\130\064\163" +
-    "\065\052\070\135\074\016\100\u0373\107\140\110\146\115" +
+    "\065\052\070\135\074\016\100\u0374\107\140\110\146\115" +
     "\214\116\066\117\200\120\155\131\111\141\101\161\134" +
     "\162\045\163\023\164\145\165\103\166\061\167\114\171" +
     "\073\212\024\241\201\243\122\244\006\246\022\251\142" +
     "\257\115\262\034\263\041\264\051\275\060\277\065\300" +
     "\227\001\001\000\116\003\204\004\105\062\177\063\130" +
-    "\064\163\065\052\070\135\074\016\100\u0372\107\140\110" +
+    "\064\163\065\052\070\135\074\016\100\u0373\107\140\110" +
     "\146\115\214\116\066\117\200\120\155\131\111\141\101" +
     "\161\134\162\045\163\023\164\145\165\103\166\061\167" +
     "\114\171\073\212\024\241\201\243\122\244\006\246\022" +
     "\251\142\257\115\262\034\263\041\264\051\275\060\277" +
     "\065\300\227\001\001\000\116\003\204\004\105\062\177" +
-    "\063\130\064\163\065\052\070\135\074\016\100\u0371\107" +
+    "\063\130\064\163\065\052\070\135\074\016\100\u0372\107" +
     "\140\110\146\115\214\116\066\117\200\120\155\131\111" +
     "\141\101\161\134\162\045\163\023\164\145\165\103\166" +
     "\061\167\114\171\073\212\024\241\201\243\122\244\006" +
     "\246\022\251\142\257\115\262\034\263\041\264\051\275" +
     "\060\277\065\300\227\001\001\000\116\003\204\004\105" +
     "\062\177\063\130\064\163\065\052\070\135\074\016\100" +
-    "\u0370\107\140\110\146\115\214\116\066\117\200\120\155" +
+    "\u0371\107\140\110\146\115\214\116\066\117\200\120\155" +
     "\131\111\141\101\161\134\162\045\163\023\164\145\165" +
     "\103\166\061\167\114\171\073\212\024\241\201\243\122" +
     "\244\006\246\022\251\142\257\115\262\034\263\041\264" +
     "\051\275\060\277\065\300\227\001\001\000\002\001\001" +
     "\000\116\003\204\004\105\062\177\063\130\064\163\065" +
-    "\052\070\135\074\016\100\u036f\107\140\110\146\115\214" +
+    "\052\070\135\074\016\100\u0370\107\140\110\146\115\214" +
     "\116\066\117\200\120\155\131\111\141\101\161\134\162" +
     "\045\163\023\164\145\165\103\166\061\167\114\171\073" +
     "\212\024\241\201\243\122\244\006\246\022\251\142\257" +
     "\115\262\034\263\041\264\051\275\060\277\065\300\227" +
     "\001\001\000\116\003\204\004\105\062\177\063\130\064" +
-    "\163\065\052\070\135\074\016\100\u036e\107\140\110\146" +
+    "\163\065\052\070\135\074\016\100\u036f\107\140\110\146" +
     "\115\214\116\066\117\200\120\155\131\111\141\101\161" +
     "\134\162\045\163\023\164\145\165\103\166\061\167\114" +
     "\171\073\212\024\241\201\243\122\244\006\246\022\251" +
@@ -729,18 +729,18 @@ public class ASTPHP5Parser extends java_cup.runtime.lr_parser {
     "\300\227\001\001\000\002\001\001\000\002\001\001\000" +
     "\002\001\001\000\002\001\001\000\002\001\001\000\002" +
     "\001\001\000\002\001\001\000\002\001\001\000\002\001" +
-    "\001\000\004\122\u036d\001\001\000\002\001\001\000\002" +
-    "\001\001\000\004\122\u0249\001\001\000\004\003\u036a\001" +
+    "\001\000\004\122\u036e\001\001\000\002\001\001\000\002" +
+    "\001\001\000\004\122\u0249\001\001\000\004\003\u036b\001" +
     "\001\000\004\122\u012c\001\001\000\126\003\204\004\105" +
     "\062\177\063\130\064\163\065\052\070\135\074\016\100" +
-    "\u0351\107\140\110\146\115\214\116\066\117\200\120\155" +
-    "\131\111\132\u0355\133\u0352\134\u0354\135\u0353\141\101\161" +
+    "\u0352\107\140\110\146\115\214\116\066\117\200\120\155" +
+    "\131\111\132\u0356\133\u0353\134\u0355\135\u0354\141\101\161" +
     "\134\162\045\163\023\164\145\165\103\166\061\167\114" +
     "\171\073\212\024\241\201\243\122\244\006\246\022\251" +
     "\142\257\115\262\034\263\041\264\051\275\060\277\065" +
     "\300\227\001\001\000\002\001\001\000\002\001\001\000" +
     "\004\122\u0120\001\001\000\002\001\001\000\002\001\001" +
-    "\000\002\001\001\000\010\116\u0342\120\155\251\142\001" +
+    "\000\002\001\001\000\010\116\u0343\120\155\251\142\001" +
     "\001\000\120\003\204\004\105\062\177\063\237\064\163" +
     "\065\052\070\135\074\016\100\231\104\233\107\140\110" +
     "\146\115\214\116\066\117\200\120\155\131\111\141\101" +
@@ -1125,7 +1125,7 @@ public class ASTPHP5Parser extends java_cup.runtime.lr_parser {
     "\264\051\275\060\277\065\300\227\001\001\000\002\001" +
     "\001\000\002\001\001\000\002\001\001\000\002\001\001" +
     "\000\002\001\001\000\002\001\001\000\004\226\u0267\001" +
-    "\001\000\006\003\u026e\172\u0339\001\001\000\004\227\u0268" +
+    "\001\000\006\003\u026e\172\u033a\001\001\000\004\227\u0268" +
     "\001\001\000\002\001\001\000\010\003\u026e\172\u026d\230" +
     "\u026b\001\001\000\004\003\u0273\001\001\000\002\001\001" +
     "\000\002\001\001\000\002\001\001\000\002\001\001\000" +
@@ -1188,12 +1188,12 @@ public class ASTPHP5Parser extends java_cup.runtime.lr_parser {
     "\012\174\u018d\175\u0191\176\u0181\177\u02e5\001\001\000\002" +
     "\001\001\000\024\041\u02ee\044\u02e9\045\u02ec\202\u02ed\203" +
     "\u02e8\254\u02e7\277\065\300\u02ea\306\u02eb\001\001\000\002" +
-    "\001\001\000\002\001\001\000\004\076\u0337\001\001\000" +
-    "\014\045\u0335\202\u02ed\203\u02e8\254\u02e7\277\u02d2\001\001" +
+    "\001\001\000\002\001\001\000\004\076\u0338\001\001\000" +
+    "\014\045\u0336\202\u02ed\203\u02e8\254\u02e7\277\u02d2\001\001" +
     "\000\002\001\001\000\002\001\001\000\016\003\u026e\172" +
-    "\u028e\231\u032f\233\u028f\235\u0290\237\u028a\001\001\000\002" +
+    "\u028e\231\u0330\233\u028f\235\u0290\237\u028a\001\001\000\002" +
     "\001\001\000\004\240\u02f1\001\001\000\016\003\u026e\172" +
-    "\u028e\232\u0327\234\u0329\235\u0328\236\u0324\001\001\000\004" +
+    "\u028e\232\u0328\234\u032a\235\u0329\236\u0325\001\001\000\004" +
     "\205\u02f2\001\001\000\002\001\001\000\004\015\u02f5\001" +
     "\001\000\002\001\001\000\150\003\204\004\105\014\u02fb" +
     "\016\u02f6\017\136\062\177\063\130\064\163\065\052\070" +
@@ -1204,11 +1204,11 @@ public class ASTPHP5Parser extends java_cup.runtime.lr_parser {
     "\171\224\026\225\055\241\201\243\122\244\006\246\022" +
     "\251\142\257\115\262\034\263\041\264\051\275\060\277" +
     "\065\300\u02fa\303\u02f8\001\001\000\002\001\001\000\004" +
-    "\022\u031e\001\001\000\002\001\001\000\002\001\001\000" +
+    "\022\u031f\001\001\000\002\001\001\000\002\001\001\000" +
     "\024\107\u02fc\143\143\210\126\211\160\223\171\224\026" +
     "\225\055\277\u02d2\303\u02fd\001\001\000\002\001\001\000" +
     "\002\001\001\000\002\001\001\000\002\001\001\000\004" +
-    "\055\u0315\001\001\000\004\055\u0301\001\001\000\002\001" +
+    "\055\u0316\001\001\000\004\055\u0301\001\001\000\002\001" +
     "\001\000\024\041\u0303\044\u02e9\045\u02ec\202\u02ed\203\u02e8" +
     "\254\u02e7\277\065\300\u02ea\306\u02eb\001\001\000\002\001" +
     "\001\000\004\042\u0306\001\001\000\002\001\001\000\004" +
@@ -1222,216 +1222,184 @@ public class ASTPHP5Parser extends java_cup.runtime.lr_parser {
     "\055\241\201\243\122\244\006\246\022\251\142\257\115" +
     "\262\034\263\041\264\051\275\060\277\065\300\u02fa\303" +
     "\u02f8\001\001\000\002\001\001\000\004\043\u030d\001\001" +
+    "\000\002\001\001\000\004\076\u0310\001\001\000\002\001" +
+    "\001\000\002\001\001\000\002\001\001\000\002\001\001" +
+    "\000\002\001\001\000\002\001\001\000\002\001\001\000" +
+    "\002\001\001\000\002\001\001\000\024\041\u0318\044\u02e9" +
+    "\045\u02ec\202\u02ed\203\u02e8\254\u02e7\277\065\300\u02ea\306" +
+    "\u02eb\001\001\000\002\001\001\000\004\240\u031a\001\001" +
+    "\000\002\001\001\000\126\003\204\004\105\062\177\063" +
+    "\130\064\163\065\052\070\135\074\016\100\020\102\u031d" +
+    "\103\u031c\105\175\106\207\107\140\110\146\115\214\116" +
+    "\066\117\200\120\155\131\111\141\101\161\134\162\045" +
+    "\163\023\164\145\165\103\166\061\167\114\171\073\212" +
+    "\024\241\201\243\122\244\006\246\022\251\142\257\115" +
+    "\262\034\263\041\264\051\275\060\277\065\300\227\001" +
+    "\001\000\002\001\001\000\002\001\001\000\002\001\001" +
     "\000\002\001\001\000\002\001\001\000\002\001\001\000" +
     "\002\001\001\000\002\001\001\000\002\001\001\000\002" +
-    "\001\001\000\002\001\001\000\002\001\001\000\002\001" +
-    "\001\000\024\041\u0317\044\u02e9\045\u02ec\202\u02ed\203\u02e8" +
-    "\254\u02e7\277\065\300\u02ea\306\u02eb\001\001\000\002\001" +
-    "\001\000\004\240\u0319\001\001\000\002\001\001\000\126" +
-    "\003\204\004\105\062\177\063\130\064\163\065\052\070" +
-    "\135\074\016\100\020\102\u031c\103\u031b\105\175\106\207" +
+    "\001\001\000\002\001\001\000\012\003\u026e\172\u028e\234" +
+    "\u032d\235\u0329\001\001\000\002\001\001\000\002\001\001" +
+    "\000\002\001\001\000\012\003\u026e\172\u028e\234\u032c\235" +
+    "\u0329\001\001\000\002\001\001\000\002\001\001\000\012" +
+    "\003\u026e\172\u028e\234\u032f\235\u0329\001\001\000\002\001" +
+    "\001\000\004\055\u0331\001\001\000\004\056\u0332\001\001" +
+    "\000\002\001\001\000\002\001\001\000\032\003\u01af\004" +
+    "\u01a6\070\u019e\071\u0335\072\u01f8\073\u01aa\161\u01ac\171\u019a" +
+    "\267\u01a4\271\u019b\272\u01a0\274\u01ae\001\001\000\002\001" +
+    "\001\000\002\001\001\000\020\045\u02ec\202\u02ed\203\u02e8" +
+    "\254\u02e7\277\065\300\u02ea\306\u0339\001\001\000\002\001" +
+    "\001\000\002\001\001\000\002\001\001\000\004\067\u033c" +
+    "\001\001\000\004\226\u033d\001\001\000\004\227\u033e\001" +
+    "\001\000\002\001\001\000\004\053\u0340\001\001\000\026" +
+    "\054\u027f\203\u0278\204\u0277\242\u0287\253\u027e\254\u0280\255" +
+    "\u027a\277\065\300\u027d\304\u0276\001\001\000\002\001\001" +
+    "\000\002\001\001\000\004\122\u012c\001\001\000\024\116" +
+    "\u012b\120\155\126\u034d\127\u0126\130\u0123\131\u0127\142\u0122" +
+    "\244\u0124\251\142\001\001\000\024\116\u012b\120\155\126" +
+    "\u0346\127\u0126\130\u0123\131\u0127\142\u0122\244\u0124\251\142" +
+    "\001\001\000\004\265\u0347\001\001\000\004\266\u0349\001" +
+    "\001\000\024\116\u012b\120\155\126\u034c\127\u0126\130\u0123" +
+    "\131\u0127\142\u0122\244\u0124\251\142\001\001\000\002\001" +
+    "\001\000\024\116\u012b\120\155\126\u034b\127\u0126\130\u0123" +
+    "\131\u0127\142\u0122\244\u0124\251\142\001\001\000\002\001" +
+    "\001\000\002\001\001\000\004\265\u034e\001\001\000\004" +
+    "\266\u0349\001\001\000\014\116\u012b\120\155\131\u0127\244" +
+    "\u0350\251\142\001\001\000\002\001\001\000\054\003\u0113" +
+    "\064\163\065\052\115\u0110\116\066\117\u010a\120\155\131" +
+    "\111\162\045\165\u010b\166\061\170\u036a\171\u010d\212\u0262" +
+    "\244\006\246\022\251\142\262\034\263\041\264\051\275" +
+    "\060\001\001\000\002\001\001\000\002\001\001\000\002" +
+    "\001\001\000\002\001\001\000\002\001\001\000\116\003" +
+    "\204\004\105\062\177\063\130\064\163\065\052\070\135" +
+    "\074\016\100\u035e\107\140\110\146\115\214\116\066\117" +
+    "\200\120\155\131\111\141\101\161\134\162\045\163\023" +
+    "\164\145\165\103\166\061\167\114\171\073\212\024\241" +
+    "\201\243\122\244\006\246\022\251\142\257\115\262\034" +
+    "\263\041\264\051\275\060\277\065\300\227\001\001\000" +
+    "\002\001\001\000\126\003\204\004\105\062\177\063\130" +
+    "\064\163\065\052\070\135\074\016\100\u0352\107\140\110" +
+    "\146\115\214\116\066\117\200\120\155\131\111\132\u035a" +
+    "\133\u0353\134\u0355\135\u0354\141\101\161\134\162\045\163" +
+    "\023\164\145\165\103\166\061\167\114\171\073\212\024" +
+    "\241\201\243\122\244\006\246\022\251\142\257\115\262" +
+    "\034\263\041\264\051\275\060\277\065\300\227\001\001" +
+    "\000\002\001\001\000\002\001\001\000\116\003\204\004" +
+    "\105\062\177\063\130\064\163\065\052\070\135\074\016" +
+    "\100\u035d\107\140\110\146\115\214\116\066\117\200\120" +
+    "\155\131\111\141\101\161\134\162\045\163\023\164\145" +
+    "\165\103\166\061\167\114\171\073\212\024\241\201\243" +
+    "\122\244\006\246\022\251\142\257\115\262\034\263\041" +
+    "\264\051\275\060\277\065\300\227\001\001\000\002\001" +
+    "\001\000\002\001\001\000\002\001\001\000\122\003\204" +
+    "\004\105\062\177\063\130\064\163\065\052\070\135\074" +
+    "\016\100\u0352\107\140\110\146\115\214\116\066\117\200" +
+    "\120\155\131\111\133\u0361\134\u0355\141\101\161\134\162" +
+    "\045\163\023\164\145\165\103\166\061\167\114\171\073" +
+    "\212\024\241\201\243\122\244\006\246\022\251\142\257" +
+    "\115\262\034\263\041\264\051\275\060\277\065\300\227" +
+    "\001\001\000\002\001\001\000\116\003\204\004\105\062" +
+    "\177\063\130\064\163\065\052\070\135\074\016\100\u0364" +
     "\107\140\110\146\115\214\116\066\117\200\120\155\131" +
     "\111\141\101\161\134\162\045\163\023\164\145\165\103" +
     "\166\061\167\114\171\073\212\024\241\201\243\122\244" +
     "\006\246\022\251\142\257\115\262\034\263\041\264\051" +
-    "\275\060\277\065\300\227\001\001\000\002\001\001\000" +
-    "\002\001\001\000\002\001\001\000\002\001\001\000\002" +
-    "\001\001\000\002\001\001\000\002\001\001\000\002\001" +
-    "\001\000\002\001\001\000\002\001\001\000\002\001\001" +
-    "\000\012\003\u026e\172\u028e\234\u032c\235\u0328\001\001\000" +
-    "\002\001\001\000\002\001\001\000\002\001\001\000\012" +
-    "\003\u026e\172\u028e\234\u032b\235\u0328\001\001\000\002\001" +
-    "\001\000\002\001\001\000\012\003\u026e\172\u028e\234\u032e" +
-    "\235\u0328\001\001\000\002\001\001\000\004\055\u0330\001" +
-    "\001\000\004\056\u0331\001\001\000\002\001\001\000\002" +
-    "\001\001\000\032\003\u01af\004\u01a6\070\u019e\071\u0334\072" +
-    "\u01f8\073\u01aa\161\u01ac\171\u019a\267\u01a4\271\u019b\272\u01a0" +
-    "\274\u01ae\001\001\000\002\001\001\000\002\001\001\000" +
-    "\020\045\u02ec\202\u02ed\203\u02e8\254\u02e7\277\065\300\u02ea" +
-    "\306\u0338\001\001\000\002\001\001\000\002\001\001\000" +
-    "\002\001\001\000\004\067\u033b\001\001\000\004\226\u033c" +
-    "\001\001\000\004\227\u033d\001\001\000\002\001\001\000" +
-    "\004\053\u033f\001\001\000\026\054\u027f\203\u0278\204\u0277" +
-    "\242\u0287\253\u027e\254\u0280\255\u027a\277\065\300\u027d\304" +
-    "\u0276\001\001\000\002\001\001\000\002\001\001\000\004" +
-    "\122\u012c\001\001\000\024\116\u012b\120\155\126\u034c\127" +
-    "\u0126\130\u0123\131\u0127\142\u0122\244\u0124\251\142\001\001" +
-    "\000\024\116\u012b\120\155\126\u0345\127\u0126\130\u0123\131" +
-    "\u0127\142\u0122\244\u0124\251\142\001\001\000\004\265\u0346" +
-    "\001\001\000\004\266\u0348\001\001\000\024\116\u012b\120" +
-    "\155\126\u034b\127\u0126\130\u0123\131\u0127\142\u0122\244\u0124" +
-    "\251\142\001\001\000\002\001\001\000\024\116\u012b\120" +
-    "\155\126\u034a\127\u0126\130\u0123\131\u0127\142\u0122\244\u0124" +
-    "\251\142\001\001\000\002\001\001\000\002\001\001\000" +
-    "\004\265\u034d\001\001\000\004\266\u0348\001\001\000\014" +
-    "\116\u012b\120\155\131\u0127\244\u034f\251\142\001\001\000" +
-    "\002\001\001\000\054\003\u0113\064\163\065\052\115\u0110" +
-    "\116\066\117\u010a\120\155\131\111\162\045\165\u010b\166" +
-    "\061\170\u0369\171\u010d\212\u0262\244\006\246\022\251\142" +
-    "\262\034\263\041\264\051\275\060\001\001\000\002\001" +
-    "\001\000\002\001\001\000\002\001\001\000\002\001\001" +
-    "\000\002\001\001\000\116\003\204\004\105\062\177\063" +
-    "\130\064\163\065\052\070\135\074\016\100\u035d\107\140" +
-    "\110\146\115\214\116\066\117\200\120\155\131\111\141" +
-    "\101\161\134\162\045\163\023\164\145\165\103\166\061" +
-    "\167\114\171\073\212\024\241\201\243\122\244\006\246" +
-    "\022\251\142\257\115\262\034\263\041\264\051\275\060" +
-    "\277\065\300\227\001\001\000\002\001\001\000\126\003" +
+    "\275\060\277\065\300\227\001\001\000\054\003\u0113\064" +
+    "\163\065\052\115\u0110\116\066\117\u010a\120\155\131\111" +
+    "\162\045\165\u010b\166\061\170\u0369\171\u010d\212\u0262\244" +
+    "\006\246\022\251\142\262\034\263\041\264\051\275\060" +
+    "\001\001\000\002\001\001\000\002\001\001\000\126\003" +
     "\204\004\105\062\177\063\130\064\163\065\052\070\135" +
-    "\074\016\100\u0351\107\140\110\146\115\214\116\066\117" +
-    "\200\120\155\131\111\132\u0359\133\u0352\134\u0354\135\u0353" +
+    "\074\016\100\u0352\107\140\110\146\115\214\116\066\117" +
+    "\200\120\155\131\111\132\u0367\133\u0353\134\u0355\135\u0354" +
     "\141\101\161\134\162\045\163\023\164\145\165\103\166" +
     "\061\167\114\171\073\212\024\241\201\243\122\244\006" +
     "\246\022\251\142\257\115\262\034\263\041\264\051\275" +
     "\060\277\065\300\227\001\001\000\002\001\001\000\002" +
-    "\001\001\000\116\003\204\004\105\062\177\063\130\064" +
-    "\163\065\052\070\135\074\016\100\u035c\107\140\110\146" +
-    "\115\214\116\066\117\200\120\155\131\111\141\101\161" +
-    "\134\162\045\163\023\164\145\165\103\166\061\167\114" +
-    "\171\073\212\024\241\201\243\122\244\006\246\022\251" +
-    "\142\257\115\262\034\263\041\264\051\275\060\277\065" +
-    "\300\227\001\001\000\002\001\001\000\002\001\001\000" +
-    "\002\001\001\000\122\003\204\004\105\062\177\063\130" +
-    "\064\163\065\052\070\135\074\016\100\u0351\107\140\110" +
-    "\146\115\214\116\066\117\200\120\155\131\111\133\u0360" +
-    "\134\u0354\141\101\161\134\162\045\163\023\164\145\165" +
-    "\103\166\061\167\114\171\073\212\024\241\201\243\122" +
-    "\244\006\246\022\251\142\257\115\262\034\263\041\264" +
-    "\051\275\060\277\065\300\227\001\001\000\002\001\001" +
-    "\000\116\003\204\004\105\062\177\063\130\064\163\065" +
-    "\052\070\135\074\016\100\u0363\107\140\110\146\115\214" +
-    "\116\066\117\200\120\155\131\111\141\101\161\134\162" +
-    "\045\163\023\164\145\165\103\166\061\167\114\171\073" +
-    "\212\024\241\201\243\122\244\006\246\022\251\142\257" +
-    "\115\262\034\263\041\264\051\275\060\277\065\300\227" +
-    "\001\001\000\054\003\u0113\064\163\065\052\115\u0110\116" +
-    "\066\117\u010a\120\155\131\111\162\045\165\u010b\166\061" +
-    "\170\u0368\171\u010d\212\u0262\244\006\246\022\251\142\262" +
-    "\034\263\041\264\051\275\060\001\001\000\002\001\001" +
-    "\000\002\001\001\000\126\003\204\004\105\062\177\063" +
-    "\130\064\163\065\052\070\135\074\016\100\u0351\107\140" +
-    "\110\146\115\214\116\066\117\200\120\155\131\111\132" +
-    "\u0366\133\u0352\134\u0354\135\u0353\141\101\161\134\162\045" +
-    "\163\023\164\145\165\103\166\061\167\114\171\073\212" +
-    "\024\241\201\243\122\244\006\246\022\251\142\257\115" +
-    "\262\034\263\041\264\051\275\060\277\065\300\227\001" +
+    "\001\001\000\002\001\001\000\002\001\001\000\002\001" +
+    "\001\000\014\116\u012b\120\155\131\u0127\244\u036d\251\142" +
+    "\001\001\000\002\001\001\000\002\001\001\000\002\001" +
     "\001\000\002\001\001\000\002\001\001\000\002\001\001" +
-    "\000\002\001\001\000\002\001\001\000\014\116\u012b\120" +
-    "\155\131\u0127\244\u036c\251\142\001\001\000\002\001\001" +
     "\000\002\001\001\000\002\001\001\000\002\001\001\000" +
     "\002\001\001\000\002\001\001\000\002\001\001\000\002" +
-    "\001\001\000\002\001\001\000\002\001\001\000\002\001" +
-    "\001\000\002\001\001\000\002\001\001\000\002\001\001" +
-    "\000\002\001\001\000\116\003\204\004\105\062\177\063" +
-    "\130\064\163\065\052\070\135\074\016\100\u037c\107\140" +
-    "\110\146\115\214\116\066\117\200\120\155\131\111\141" +
-    "\101\161\134\162\045\163\023\164\145\165\103\166\061" +
-    "\167\114\171\073\212\024\241\201\243\122\244\006\246" +
-    "\022\251\142\257\115\262\034\263\041\264\051\275\060" +
-    "\277\065\300\227\001\001\000\002\001\001\000\116\003" +
+    "\001\001\000\002\001\001\000\002\001\001\000\116\003" +
     "\204\004\105\062\177\063\130\064\163\065\052\070\135" +
-    "\074\016\100\u037e\107\140\110\146\115\214\116\066\117" +
+    "\074\016\100\u037d\107\140\110\146\115\214\116\066\117" +
     "\200\120\155\131\111\141\101\161\134\162\045\163\023" +
     "\164\145\165\103\166\061\167\114\171\073\212\024\241" +
     "\201\243\122\244\006\246\022\251\142\257\115\262\034" +
     "\263\041\264\051\275\060\277\065\300\227\001\001\000" +
-    "\002\001\001\000\002\001\001\000\002\001\001\000\002" +
-    "\001\001\000\002\001\001\000\002\001\001\000\002\001" +
-    "\001\000\002\001\001\000\004\067\u0387\001\001\000\002" +
-    "\001\001\000\002\001\001\000\002\001\001\000\002\001" +
-    "\001\000\002\001\001\000\002\001\001\000\024\041\u038e" +
-    "\044\u02e9\045\u02ec\202\u02ed\203\u02e8\254\u02e7\277\065\300" +
-    "\u02ea\306\u02eb\001\001\000\002\001\001\000\004\042\u0390" +
-    "\001\001\000\004\240\u0391\001\001\000\002\001\001\000" +
-    "\004\015\u0393\001\001\000\150\003\204\004\105\014\u02fb" +
-    "\016\u02f6\017\136\062\177\063\130\064\163\065\052\070" +
-    "\135\074\016\100\020\102\106\105\175\106\207\107\140" +
-    "\110\146\115\214\116\066\117\200\120\155\131\111\141" +
-    "\101\143\143\161\134\162\045\163\023\164\145\165\103" +
-    "\166\061\167\114\171\073\210\126\211\160\212\024\223" +
-    "\171\224\026\225\055\241\201\243\122\244\006\246\022" +
+    "\002\001\001\000\116\003\204\004\105\062\177\063\130" +
+    "\064\163\065\052\070\135\074\016\100\u037f\107\140\110" +
+    "\146\115\214\116\066\117\200\120\155\131\111\141\101" +
+    "\161\134\162\045\163\023\164\145\165\103\166\061\167" +
+    "\114\171\073\212\024\241\201\243\122\244\006\246\022" +
     "\251\142\257\115\262\034\263\041\264\051\275\060\277" +
-    "\065\300\u02fa\303\u02f8\001\001\000\002\001\001\000\004" +
-    "\003\u0396\001\001\000\002\001\001\000\002\001\001\000" +
-    "\130\003\204\004\105\014\u039a\017\136\062\177\063\130" +
-    "\064\163\065\052\070\135\074\016\100\020\102\106\105" +
-    "\175\106\207\107\140\110\146\115\214\116\066\117\200" +
-    "\120\155\131\111\141\101\161\134\162\045\163\023\164" +
-    "\145\165\103\166\061\167\114\171\073\212\024\241\201" +
+    "\065\300\227\001\001\000\002\001\001\000\002\001\001" +
+    "\000\002\001\001\000\002\001\001\000\002\001\001\000" +
+    "\002\001\001\000\002\001\001\000\002\001\001\000\004" +
+    "\067\u0388\001\001\000\002\001\001\000\002\001\001\000" +
+    "\002\001\001\000\002\001\001\000\002\001\001\000\002" +
+    "\001\001\000\024\041\u038f\044\u02e9\045\u02ec\202\u02ed\203" +
+    "\u02e8\254\u02e7\277\065\300\u02ea\306\u02eb\001\001\000\002" +
+    "\001\001\000\004\042\u0391\001\001\000\004\240\u0392\001" +
+    "\001\000\002\001\001\000\004\015\u0394\001\001\000\150" +
+    "\003\204\004\105\014\u02fb\016\u02f6\017\136\062\177\063" +
+    "\130\064\163\065\052\070\135\074\016\100\020\102\106" +
+    "\105\175\106\207\107\140\110\146\115\214\116\066\117" +
+    "\200\120\155\131\111\141\101\143\143\161\134\162\045" +
+    "\163\023\164\145\165\103\166\061\167\114\171\073\210" +
+    "\126\211\160\212\024\223\171\224\026\225\055\241\201" +
     "\243\122\244\006\246\022\251\142\257\115\262\034\263" +
-    "\041\264\051\275\060\277\065\300\227\001\001\000\004" +
-    "\015\u03a4\001\001\000\004\035\u039b\001\001\000\004\037" +
-    "\u039c\001\001\000\002\001\001\000\130\003\204\004\105" +
-    "\014\u03a3\017\136\062\177\063\130\064\163\065\052\070" +
-    "\135\074\016\100\020\102\106\105\175\106\207\107\140" +
-    "\110\146\115\214\116\066\117\200\120\155\131\111\141" +
-    "\101\161\134\162\045\163\023\164\145\165\103\166\061" +
-    "\167\114\171\073\212\024\241\201\243\122\244\006\246" +
-    "\022\251\142\257\115\262\034\263\041\264\051\275\060" +
-    "\277\065\300\227\001\001\000\002\001\001\000\116\003" +
-    "\204\004\105\062\177\063\130\064\163\065\052\070\135" +
-    "\074\016\100\u03a0\107\140\110\146\115\214\116\066\117" +
+    "\041\264\051\275\060\277\065\300\u02fa\303\u02f8\001\001" +
+    "\000\002\001\001\000\004\003\u0397\001\001\000\002\001" +
+    "\001\000\002\001\001\000\130\003\204\004\105\014\u039b" +
+    "\017\136\062\177\063\130\064\163\065\052\070\135\074" +
+    "\016\100\020\102\106\105\175\106\207\107\140\110\146" +
+    "\115\214\116\066\117\200\120\155\131\111\141\101\161" +
+    "\134\162\045\163\023\164\145\165\103\166\061\167\114" +
+    "\171\073\212\024\241\201\243\122\244\006\246\022\251" +
+    "\142\257\115\262\034\263\041\264\051\275\060\277\065" +
+    "\300\227\001\001\000\004\015\u03a5\001\001\000\004\035" +
+    "\u039c\001\001\000\004\037\u039d\001\001\000\002\001\001" +
+    "\000\130\003\204\004\105\014\u03a4\017\136\062\177\063" +
+    "\130\064\163\065\052\070\135\074\016\100\020\102\106" +
+    "\105\175\106\207\107\140\110\146\115\214\116\066\117" +
     "\200\120\155\131\111\141\101\161\134\162\045\163\023" +
     "\164\145\165\103\166\061\167\114\171\073\212\024\241" +
     "\201\243\122\244\006\246\022\251\142\257\115\262\034" +
     "\263\041\264\051\275\060\277\065\300\227\001\001\000" +
-    "\002\001\001\000\130\003\204\004\105\014\u03a2\017\136" +
-    "\062\177\063\130\064\163\065\052\070\135\074\016\100" +
-    "\020\102\106\105\175\106\207\107\140\110\146\115\214" +
-    "\116\066\117\200\120\155\131\111\141\101\161\134\162" +
-    "\045\163\023\164\145\165\103\166\061\167\114\171\073" +
-    "\212\024\241\201\243\122\244\006\246\022\251\142\257" +
-    "\115\262\034\263\041\264\051\275\060\277\065\300\227" +
-    "\001\001\000\002\001\001\000\002\001\001\000\152\003" +
-    "\204\004\105\014\u02fb\016\u02f6\017\136\036\u03a5\062\177" +
-    "\063\130\064\163\065\052\070\135\074\016\100\020\102" +
-    "\106\105\175\106\207\107\140\110\146\115\214\116\066" +
-    "\117\200\120\155\131\111\141\101\143\143\161\134\162" +
-    "\045\163\023\164\145\165\103\166\061\167\114\171\073" +
-    "\210\126\211\160\212\024\223\171\224\026\225\055\241" +
-    "\201\243\122\244\006\246\022\251\142\257\115\262\034" +
-    "\263\041\264\051\275\060\277\065\300\u02fa\303\u02f8\001" +
-    "\001\000\004\040\u03a6\001\001\000\002\001\001\000\002" +
-    "\001\001\000\002\001\001\000\116\003\204\004\105\062" +
-    "\177\063\130\064\163\065\052\070\135\074\016\100\u03aa" +
+    "\002\001\001\000\116\003\204\004\105\062\177\063\130" +
+    "\064\163\065\052\070\135\074\016\100\u03a1\107\140\110" +
+    "\146\115\214\116\066\117\200\120\155\131\111\141\101" +
+    "\161\134\162\045\163\023\164\145\165\103\166\061\167" +
+    "\114\171\073\212\024\241\201\243\122\244\006\246\022" +
+    "\251\142\257\115\262\034\263\041\264\051\275\060\277" +
+    "\065\300\227\001\001\000\002\001\001\000\130\003\204" +
+    "\004\105\014\u03a3\017\136\062\177\063\130\064\163\065" +
+    "\052\070\135\074\016\100\020\102\106\105\175\106\207" +
     "\107\140\110\146\115\214\116\066\117\200\120\155\131" +
     "\111\141\101\161\134\162\045\163\023\164\145\165\103" +
     "\166\061\167\114\171\073\212\024\241\201\243\122\244" +
     "\006\246\022\251\142\257\115\262\034\263\041\264\051" +
     "\275\060\277\065\300\227\001\001\000\002\001\001\000" +
-    "\002\001\001\000\004\015\u03ad\001\001\000\150\003\204" +
-    "\004\105\014\u02fb\016\u02f6\017\136\062\177\063\130\064" +
-    "\163\065\052\070\135\074\016\100\020\102\106\105\175" +
-    "\106\207\107\140\110\146\115\214\116\066\117\200\120" +
-    "\155\131\111\141\101\143\143\161\134\162\045\163\023" +
-    "\164\145\165\103\166\061\167\114\171\073\210\126\211" +
-    "\160\212\024\223\171\224\026\225\055\241\201\243\122" +
-    "\244\006\246\022\251\142\257\115\262\034\263\041\264" +
-    "\051\275\060\277\065\300\u02fa\303\u02f8\001\001\000\004" +
-    "\015\u03af\001\001\000\150\003\204\004\105\014\u02fb\016" +
-    "\u02f6\017\136\062\177\063\130\064\163\065\052\070\135" +
-    "\074\016\100\020\102\106\105\175\106\207\107\140\110" +
-    "\146\115\214\116\066\117\200\120\155\131\111\141\101" +
-    "\143\143\161\134\162\045\163\023\164\145\165\103\166" +
-    "\061\167\114\171\073\210\126\211\160\212\024\223\171" +
-    "\224\026\225\055\241\201\243\122\244\006\246\022\251" +
-    "\142\257\115\262\034\263\041\264\051\275\060\277\065" +
-    "\300\u02fa\303\u02f8\001\001\000\002\001\001\000\002\001" +
-    "\001\000\006\030\u03b3\142\u03b4\001\001\000\002\001\001" +
-    "\000\002\001\001\000\032\003\u01af\004\u01a6\070\u019e\071" +
-    "\u03b6\072\u01f8\073\u01aa\161\u01ac\171\u019a\267\u01a4\271\u019b" +
-    "\272\u01a0\274\u01ae\001\001\000\002\001\001\000\132\003" +
-    "\204\004\105\014\u03be\017\136\027\u03bc\062\177\063\130" +
-    "\064\163\065\052\070\135\074\016\100\020\102\106\105" +
-    "\175\106\207\107\140\110\146\115\214\116\066\117\200" +
-    "\120\155\131\111\141\101\161\134\162\045\163\023\164" +
-    "\145\165\103\166\061\167\114\171\073\212\024\241\201" +
-    "\243\122\244\006\246\022\251\142\257\115\262\034\263" +
-    "\041\264\051\275\060\277\065\300\227\001\001\000\004" +
-    "\142\u03b9\001\001\000\002\001\001\000\032\003\u01af\004" +
-    "\u01a6\070\u019e\071\u03bb\072\u01f8\073\u01aa\161\u01ac\171\u019a" +
-    "\267\u01a4\271\u019b\272\u01a0\274\u01ae\001\001\000\002\001" +
-    "\001\000\002\001\001\000\004\015\u03bf\001\001\000\002" +
+    "\002\001\001\000\152\003\204\004\105\014\u02fb\016\u02f6" +
+    "\017\136\036\u03a6\062\177\063\130\064\163\065\052\070" +
+    "\135\074\016\100\020\102\106\105\175\106\207\107\140" +
+    "\110\146\115\214\116\066\117\200\120\155\131\111\141" +
+    "\101\143\143\161\134\162\045\163\023\164\145\165\103" +
+    "\166\061\167\114\171\073\210\126\211\160\212\024\223" +
+    "\171\224\026\225\055\241\201\243\122\244\006\246\022" +
+    "\251\142\257\115\262\034\263\041\264\051\275\060\277" +
+    "\065\300\u02fa\303\u02f8\001\001\000\004\040\u03a7\001\001" +
+    "\000\002\001\001\000\002\001\001\000\002\001\001\000" +
+    "\116\003\204\004\105\062\177\063\130\064\163\065\052" +
+    "\070\135\074\016\100\u03ab\107\140\110\146\115\214\116" +
+    "\066\117\200\120\155\131\111\141\101\161\134\162\045" +
+    "\163\023\164\145\165\103\166\061\167\114\171\073\212" +
+    "\024\241\201\243\122\244\006\246\022\251\142\257\115" +
+    "\262\034\263\041\264\051\275\060\277\065\300\227\001" +
+    "\001\000\002\001\001\000\002\001\001\000\004\015\u03ae" +
     "\001\001\000\150\003\204\004\105\014\u02fb\016\u02f6\017" +
     "\136\062\177\063\130\064\163\065\052\070\135\074\016" +
     "\100\020\102\106\105\175\106\207\107\140\110\146\115" +
@@ -1440,397 +1408,315 @@ public class ASTPHP5Parser extends java_cup.runtime.lr_parser {
     "\114\171\073\210\126\211\160\212\024\223\171\224\026" +
     "\225\055\241\201\243\122\244\006\246\022\251\142\257" +
     "\115\262\034\263\041\264\051\275\060\277\065\300\u02fa" +
-    "\303\u02f8\001\001\000\002\001\001\000\002\001\001\000" +
-    "\002\001\001\000\002\001\001\000\002\001\001\000\126" +
-    "\003\204\004\105\062\177\063\130\064\163\065\052\070" +
-    "\135\074\016\100\u0351\107\140\110\146\115\214\116\066" +
-    "\117\200\120\155\131\111\132\u03c6\133\u0352\134\u0354\135" +
-    "\u0353\141\101\161\134\162\045\163\023\164\145\165\103" +
-    "\166\061\167\114\171\073\212\024\241\201\243\122\244" +
+    "\303\u02f8\001\001\000\004\015\u03b0\001\001\000\150\003" +
+    "\204\004\105\014\u02fb\016\u02f6\017\136\062\177\063\130" +
+    "\064\163\065\052\070\135\074\016\100\020\102\106\105" +
+    "\175\106\207\107\140\110\146\115\214\116\066\117\200" +
+    "\120\155\131\111\141\101\143\143\161\134\162\045\163" +
+    "\023\164\145\165\103\166\061\167\114\171\073\210\126" +
+    "\211\160\212\024\223\171\224\026\225\055\241\201\243" +
+    "\122\244\006\246\022\251\142\257\115\262\034\263\041" +
+    "\264\051\275\060\277\065\300\u02fa\303\u02f8\001\001\000" +
+    "\002\001\001\000\002\001\001\000\006\030\u03b4\142\u03b5" +
+    "\001\001\000\002\001\001\000\002\001\001\000\032\003" +
+    "\u01af\004\u01a6\070\u019e\071\u03b7\072\u01f8\073\u01aa\161\u01ac" +
+    "\171\u019a\267\u01a4\271\u019b\272\u01a0\274\u01ae\001\001\000" +
+    "\002\001\001\000\132\003\204\004\105\014\u03bf\017\136" +
+    "\027\u03bd\062\177\063\130\064\163\065\052\070\135\074" +
+    "\016\100\020\102\106\105\175\106\207\107\140\110\146" +
+    "\115\214\116\066\117\200\120\155\131\111\141\101\161" +
+    "\134\162\045\163\023\164\145\165\103\166\061\167\114" +
+    "\171\073\212\024\241\201\243\122\244\006\246\022\251" +
+    "\142\257\115\262\034\263\041\264\051\275\060\277\065" +
+    "\300\227\001\001\000\004\142\u03ba\001\001\000\002\001" +
+    "\001\000\032\003\u01af\004\u01a6\070\u019e\071\u03bc\072\u01f8" +
+    "\073\u01aa\161\u01ac\171\u019a\267\u01a4\271\u019b\272\u01a0\274" +
+    "\u01ae\001\001\000\002\001\001\000\002\001\001\000\004" +
+    "\015\u03c0\001\001\000\002\001\001\000\150\003\204\004" +
+    "\105\014\u02fb\016\u02f6\017\136\062\177\063\130\064\163" +
+    "\065\052\070\135\074\016\100\020\102\106\105\175\106" +
+    "\207\107\140\110\146\115\214\116\066\117\200\120\155" +
+    "\131\111\141\101\143\143\161\134\162\045\163\023\164" +
+    "\145\165\103\166\061\167\114\171\073\210\126\211\160" +
+    "\212\024\223\171\224\026\225\055\241\201\243\122\244" +
     "\006\246\022\251\142\257\115\262\034\263\041\264\051" +
-    "\275\060\277\065\300\227\001\001\000\002\001\001\000" +
-    "\002\001\001\000\002\001\001\000\002\001\001\000\002" +
-    "\001\001\000\002\001\001\000\064\003\u03d6\004\105\064" +
-    "\163\065\052\115\u0110\116\066\117\u03d4\120\155\131\111" +
-    "\162\045\163\u03cf\164\145\165\u010b\166\061\171\u03cd\212" +
-    "\u03d3\244\006\246\022\247\u03d5\250\u03d1\251\142\262\034" +
+    "\275\060\277\065\300\u02fa\303\u02f8\001\001\000\002\001" +
+    "\001\000\002\001\001\000\002\001\001\000\002\001\001" +
+    "\000\002\001\001\000\126\003\204\004\105\062\177\063" +
+    "\130\064\163\065\052\070\135\074\016\100\u0352\107\140" +
+    "\110\146\115\214\116\066\117\200\120\155\131\111\132" +
+    "\u03c7\133\u0353\134\u0355\135\u0354\141\101\161\134\162\045" +
+    "\163\023\164\145\165\103\166\061\167\114\171\073\212" +
+    "\024\241\201\243\122\244\006\246\022\251\142\257\115" +
+    "\262\034\263\041\264\051\275\060\277\065\300\227\001" +
+    "\001\000\002\001\001\000\002\001\001\000\002\001\001" +
+    "\000\002\001\001\000\002\001\001\000\002\001\001\000" +
+    "\064\003\u03d7\004\105\064\163\065\052\115\u0110\116\066" +
+    "\117\u03d5\120\155\131\111\162\045\163\u03d0\164\145\165" +
+    "\u010b\166\061\171\u03ce\212\u03d4\244\006\246\022\247\u03d6" +
+    "\250\u03d2\251\142\262\034\263\041\264\051\275\060\001" +
+    "\001\000\002\001\001\000\004\003\u03ea\001\001\000\002" +
+    "\001\001\000\002\001\001\000\002\001\001\000\004\122" +
+    "\u03e7\001\001\000\002\001\001\000\002\001\001\000\004" +
+    "\076\u03d9\001\001\000\002\001\001\000\062\003\u03d7\004" +
+    "\105\064\163\065\052\115\u0110\116\066\117\u03d5\120\155" +
+    "\131\111\162\045\163\u03d0\164\145\165\u010b\166\061\171" +
+    "\u03ce\212\u03d4\244\006\246\022\250\u03db\251\142\262\034" +
     "\263\041\264\051\275\060\001\001\000\002\001\001\000" +
-    "\004\003\u03e9\001\001\000\002\001\001\000\002\001\001" +
-    "\000\002\001\001\000\004\122\u03e6\001\001\000\002\001" +
-    "\001\000\002\001\001\000\004\076\u03d8\001\001\000\002" +
-    "\001\001\000\062\003\u03d6\004\105\064\163\065\052\115" +
-    "\u0110\116\066\117\u03d4\120\155\131\111\162\045\163\u03cf" +
-    "\164\145\165\u010b\166\061\171\u03cd\212\u03d3\244\006\246" +
-    "\022\250\u03da\251\142\262\034\263\041\264\051\275\060" +
-    "\001\001\000\002\001\001\000\002\001\001\000\002\001" +
-    "\001\000\032\003\u03e1\004\105\116\u012b\120\155\131\u0127" +
-    "\164\u03e0\174\u018d\175\u0191\176\u0181\177\u024d\244\u024b\251" +
-    "\142\001\001\000\004\122\u0397\001\001\000\002\001\001" +
-    "\000\004\003\u03e5\001\001\000\002\001\001\000\004\122" +
-    "\u03e2\001\001\000\002\001\001\000\002\001\001\000\004" +
-    "\003\u03e4\001\001\000\002\001\001\000\002\001\001\000" +
-    "\002\001\001\000\004\003\u03e8\001\001\000\002\001\001" +
-    "\000\002\001\001\000\032\003\u03e1\004\105\116\u012b\120" +
-    "\155\131\u0127\164\u03eb\174\u018d\175\u0191\176\u0181\177\u0239" +
-    "\244\u0237\251\142\001\001\000\004\122\u03e2\001\001\000" +
-    "\002\001\001\000\116\003\204\004\105\062\177\063\130" +
-    "\064\163\065\052\070\135\074\016\100\u03ef\107\140\110" +
-    "\146\115\214\116\066\117\200\120\155\131\111\141\101" +
-    "\161\134\162\045\163\023\164\145\165\103\166\061\167" +
-    "\114\171\073\212\024\241\201\243\122\244\006\246\022" +
-    "\251\142\257\115\262\034\263\041\264\051\275\060\277" +
-    "\065\300\227\001\001\000\002\001\001\000\002\001\001" +
-    "\000\002\001\001\000\002\001\001\000\026\116\u012b\120" +
-    "\155\131\u0127\174\u018d\175\u0191\176\u0181\177\u03f4\244\u024b" +
-    "\251\142\260\u03f3\001\001\000\004\122\u03f5\001\001\000" +
-    "\002\001\001\000\002\001\001\000\002\001\001\000\002" +
-    "\001\001\000\002\001\001\000\002\001\001\000\122\003" +
-    "\204\004\105\062\177\063\237\064\163\065\052\070\135" +
-    "\074\016\100\231\104\233\106\u03c9\107\140\110\146\115" +
-    "\214\116\066\117\200\120\155\131\111\141\101\161\134" +
-    "\162\045\163\023\164\145\165\103\166\061\167\234\171" +
-    "\073\212\232\241\240\243\122\244\006\246\022\251\142" +
-    "\257\115\262\034\263\041\264\051\275\060\277\065\300" +
-    "\227\001\001\000\002\001\001\000\002\001\001\000\002" +
-    "\001\001\000\002\001\001\000\030\003\u01af\004\u01a6\070" +
-    "\u019e\072\u0400\073\u01aa\161\u01ac\171\u019a\267\u01a4\271\u019b" +
-    "\272\u01a0\274\u01ae\001\001\000\002\001\001\000\002\001" +
-    "\001\000\002\001\001\000\002\001\001\000\116\003\204" +
+    "\002\001\001\000\002\001\001\000\032\003\u03e2\004\105" +
+    "\116\u012b\120\155\131\u0127\164\u03e1\174\u018d\175\u0191\176" +
+    "\u0181\177\u024d\244\u024b\251\142\001\001\000\004\122\u0398" +
+    "\001\001\000\002\001\001\000\004\003\u03e6\001\001\000" +
+    "\002\001\001\000\004\122\u03e3\001\001\000\002\001\001" +
+    "\000\002\001\001\000\004\003\u03e5\001\001\000\002\001" +
+    "\001\000\002\001\001\000\002\001\001\000\004\003\u03e9" +
+    "\001\001\000\002\001\001\000\002\001\001\000\032\003" +
+    "\u03e2\004\105\116\u012b\120\155\131\u0127\164\u03ec\174\u018d" +
+    "\175\u0191\176\u0181\177\u0239\244\u0237\251\142\001\001\000" +
+    "\004\122\u03e3\001\001\000\002\001\001\000\116\003\204" +
     "\004\105\062\177\063\130\064\163\065\052\070\135\074" +
-    "\016\100\u0405\107\140\110\146\115\214\116\066\117\200" +
+    "\016\100\u03f0\107\140\110\146\115\214\116\066\117\200" +
     "\120\155\131\111\141\101\161\134\162\045\163\023\164" +
     "\145\165\103\166\061\167\114\171\073\212\024\241\201" +
     "\243\122\244\006\246\022\251\142\257\115\262\034\263" +
     "\041\264\051\275\060\277\065\300\227\001\001\000\002" +
-    "\001\001\000\004\031\u0407\001\001\000\002\001\001\000" +
-    "\004\032\u041a\001\001\000\004\032\u040a\001\001\000\002" +
-    "\001\001\000\004\032\u040c\001\001\000\002\001\001\000" +
-    "\002\001\001\000\116\003\204\004\105\062\177\063\130" +
-    "\064\163\065\052\070\135\074\016\100\u0414\107\140\110" +
-    "\146\115\214\116\066\117\200\120\155\131\111\141\101" +
-    "\161\134\162\045\163\023\164\145\165\103\166\061\167" +
-    "\114\171\073\212\024\241\201\243\122\244\006\246\022" +
-    "\251\142\257\115\262\034\263\041\264\051\275\060\277" +
-    "\065\300\227\001\001\000\004\033\u0410\001\001\000\004" +
-    "\015\u0413\001\001\000\002\001\001\000\002\001\001\000" +
-    "\150\003\204\004\105\014\u02fb\016\u02f6\017\136\062\177" +
-    "\063\130\064\163\065\052\070\135\074\016\100\020\102" +
-    "\106\105\175\106\207\107\140\110\146\115\214\116\066" +
-    "\117\200\120\155\131\111\141\101\143\143\161\134\162" +
-    "\045\163\023\164\145\165\103\166\061\167\114\171\073" +
-    "\210\126\211\160\212\024\223\171\224\026\225\055\241" +
-    "\201\243\122\244\006\246\022\251\142\257\115\262\034" +
-    "\263\041\264\051\275\060\277\065\300\u02fa\303\u02f8\001" +
-    "\001\000\004\033\u0415\001\001\000\004\015\u0416\001\001" +
-    "\000\150\003\204\004\105\014\u02fb\016\u02f6\017\136\062" +
-    "\177\063\130\064\163\065\052\070\135\074\016\100\020" +
-    "\102\106\105\175\106\207\107\140\110\146\115\214\116" +
-    "\066\117\200\120\155\131\111\141\101\143\143\161\134" +
-    "\162\045\163\023\164\145\165\103\166\061\167\114\171" +
-    "\073\210\126\211\160\212\024\223\171\224\026\225\055" +
-    "\241\201\243\122\244\006\246\022\251\142\257\115\262" +
-    "\034\263\041\264\051\275\060\277\065\300\u02fa\303\u02f8" +
-    "\001\001\000\002\001\001\000\002\001\001\000\002\001" +
-    "\001\000\002\001\001\000\004\032\u041c\001\001\000\002" +
-    "\001\001\000\002\001\001\000\002\001\001\000\010\046" +
-    "\u0420\047\350\056\351\001\001\000\002\001\001\000\002" +
-    "\001\001\000\002\001\001\000\002\001\001\000\002\001" +
-    "\001\000\002\001\001\000\116\003\204\004\105\062\177" +
-    "\063\130\064\163\065\052\070\135\074\016\100\u0428\107" +
-    "\140\110\146\115\214\116\066\117\200\120\155\131\111" +
-    "\141\101\161\134\162\045\163\023\164\145\165\103\166" +
-    "\061\167\114\171\073\212\024\241\201\243\122\244\006" +
-    "\246\022\251\142\257\115\262\034\263\041\264\051\275" +
-    "\060\277\065\300\227\001\001\000\002\001\001\000\002" +
     "\001\001\000\002\001\001\000\002\001\001\000\002\001" +
+    "\001\000\026\116\u012b\120\155\131\u0127\174\u018d\175\u0191" +
+    "\176\u0181\177\u03f5\244\u024b\251\142\260\u03f4\001\001\000" +
+    "\004\122\u03f6\001\001\000\002\001\001\000\002\001\001" +
+    "\000\002\001\001\000\002\001\001\000\002\001\001\000" +
+    "\002\001\001\000\122\003\204\004\105\062\177\063\237" +
+    "\064\163\065\052\070\135\074\016\100\231\104\233\106" +
+    "\u03ca\107\140\110\146\115\214\116\066\117\200\120\155" +
+    "\131\111\141\101\161\134\162\045\163\023\164\145\165" +
+    "\103\166\061\167\234\171\073\212\232\241\240\243\122" +
+    "\244\006\246\022\251\142\257\115\262\034\263\041\264" +
+    "\051\275\060\277\065\300\227\001\001\000\002\001\001" +
+    "\000\002\001\001\000\002\001\001\000\002\001\001\000" +
+    "\030\003\u01af\004\u01a6\070\u019e\072\u0401\073\u01aa\161\u01ac" +
+    "\171\u019a\267\u01a4\271\u019b\272\u01a0\274\u01ae\001\001\000" +
+    "\002\001\001\000\002\001\001\000\002\001\001\000\002" +
+    "\001\001\000\116\003\204\004\105\062\177\063\130\064" +
+    "\163\065\052\070\135\074\016\100\u0406\107\140\110\146" +
+    "\115\214\116\066\117\200\120\155\131\111\141\101\161" +
+    "\134\162\045\163\023\164\145\165\103\166\061\167\114" +
+    "\171\073\212\024\241\201\243\122\244\006\246\022\251" +
+    "\142\257\115\262\034\263\041\264\051\275\060\277\065" +
+    "\300\227\001\001\000\002\001\001\000\004\031\u0408\001" +
+    "\001\000\002\001\001\000\004\032\u041b\001\001\000\004" +
+    "\032\u040b\001\001\000\002\001\001\000\004\032\u040d\001" +
     "\001\000\002\001\001\000\002\001\001\000\116\003\204" +
     "\004\105\062\177\063\130\064\163\065\052\070\135\074" +
-    "\016\100\u042f\107\140\110\146\115\214\116\066\117\200" +
+    "\016\100\u0415\107\140\110\146\115\214\116\066\117\200" +
     "\120\155\131\111\141\101\161\134\162\045\163\023\164" +
     "\145\165\103\166\061\167\114\171\073\212\024\241\201" +
     "\243\122\244\006\246\022\251\142\257\115\262\034\263" +
-    "\041\264\051\275\060\277\065\300\227\001\001\000\002" +
-    "\001\001\000\002\001\001\000\002\001\001\000\002\001" +
-    "\001\000\004\154\u0434\001\001\000\024\155\u0438\204\u0436" +
-    "\242\u043d\253\u027e\254\u0439\255\u027a\277\065\300\u0437\305" +
-    "\u0435\001\001\000\002\001\001\000\002\001\001\000\020" +
-    "\204\u0436\242\u043d\253\u027e\254\u0439\255\u027a\277\u02d2\305" +
-    "\u0443\001\001\000\002\001\001\000\006\253\u02cb\255\u02ca" +
-    "\001\001\000\002\001\001\000\002\001\001\000\010\003" +
-    "\u02a2\145\u0441\160\u02a1\001\001\000\016\003\u026e\172\u028e" +
-    "\231\u043e\233\u028f\235\u0290\237\u028a\001\001\000\004\173" +
-    "\u043f\001\001\000\002\001\001\000\002\001\001\000\004" +
-    "\146\u0442\001\001\000\002\001\001\000\002\001\001\000" +
-    "\004\055\u0445\001\001\000\012\174\u018d\175\u0191\176\u0181" +
-    "\177\u0446\001\001\000\002\001\001\000\024\041\u0448\044" +
-    "\u02e9\045\u02ec\202\u02ed\203\u02e8\254\u02e7\277\065\300\u02ea" +
-    "\306\u02eb\001\001\000\002\001\001\000\004\240\u044a\001" +
-    "\001\000\004\205\u044b\001\001\000\002\001\001\000\002" +
-    "\001\001\000\002\001\001\000\002\001\001\000\002\001" +
-    "\001\000\004\142\u0452\001\001\000\002\001\001\000\002" +
-    "\001\001\000\030\003\u01af\004\u01a6\070\u019e\072\u0454\073" +
-    "\u01aa\161\u01ac\171\u019a\267\u01a4\271\u019b\272\u01a0\274\u01ae" +
-    "\001\001\000\002\001\001\000\004\144\u0456\001\001\000" +
-    "\002\001\001\000\010\003\u026e\172\u026d\230\u0458\001\001" +
-    "\000\002\001\001\000\004\156\u045a\001\001\000\016\157" +
-    "\u045d\203\u045c\204\u0460\253\u045f\254\u045b\255\u027a\001\001" +
-    "\000\006\253\u046d\255\u02ca\001\001\000\004\200\u046b\001" +
-    "\001\000\002\001\001\000\002\001\001\000\006\254\u046a" +
-    "\255\u02ce\001\001\000\002\001\001\000\002\001\001\000" +
-    "\004\055\u0463\001\001\000\012\174\u018d\175\u0191\176\u0181" +
-    "\177\u0464\001\001\000\002\001\001\000\024\041\u0466\044" +
-    "\u02e9\045\u02ec\202\u02ed\203\u02e8\254\u02e7\277\065\300\u02ea" +
-    "\306\u02eb\001\001\000\002\001\001\000\004\240\u0468\001" +
-    "\001\000\002\001\001\000\002\001\001\000\004\255\u02d0" +
-    "\001\001\000\002\001\001\000\002\001\001\000\004\255" +
-    "\u02cc\001\001\000\006\137\u0470\251\u046f\001\001\000\002" +
-    "\001\001\000\002\001\001\000\002\001\001\000\052\003" +
-    "\u0113\064\163\065\052\115\u0110\116\066\117\u010a\120\155" +
-    "\131\111\162\045\165\u010b\166\061\171\u010d\212\u047c\244" +
-    "\006\246\022\251\142\262\034\263\041\264\051\275\060" +
+    "\041\264\051\275\060\277\065\300\227\001\001\000\004" +
+    "\033\u0411\001\001\000\004\015\u0414\001\001\000\002\001" +
+    "\001\000\002\001\001\000\150\003\204\004\105\014\u02fb" +
+    "\016\u02f6\017\136\062\177\063\130\064\163\065\052\070" +
+    "\135\074\016\100\020\102\106\105\175\106\207\107\140" +
+    "\110\146\115\214\116\066\117\200\120\155\131\111\141" +
+    "\101\143\143\161\134\162\045\163\023\164\145\165\103" +
+    "\166\061\167\114\171\073\210\126\211\160\212\024\223" +
+    "\171\224\026\225\055\241\201\243\122\244\006\246\022" +
+    "\251\142\257\115\262\034\263\041\264\051\275\060\277" +
+    "\065\300\u02fa\303\u02f8\001\001\000\004\033\u0416\001\001" +
+    "\000\004\015\u0417\001\001\000\150\003\204\004\105\014" +
+    "\u02fb\016\u02f6\017\136\062\177\063\130\064\163\065\052" +
+    "\070\135\074\016\100\020\102\106\105\175\106\207\107" +
+    "\140\110\146\115\214\116\066\117\200\120\155\131\111" +
+    "\141\101\143\143\161\134\162\045\163\023\164\145\165" +
+    "\103\166\061\167\114\171\073\210\126\211\160\212\024" +
+    "\223\171\224\026\225\055\241\201\243\122\244\006\246" +
+    "\022\251\142\257\115\262\034\263\041\264\051\275\060" +
+    "\277\065\300\u02fa\303\u02f8\001\001\000\002\001\001\000" +
+    "\002\001\001\000\002\001\001\000\002\001\001\000\004" +
+    "\032\u041d\001\001\000\002\001\001\000\002\001\001\000" +
+    "\002\001\001\000\010\046\u0421\047\350\056\351\001\001" +
+    "\000\002\001\001\000\002\001\001\000\002\001\001\000" +
+    "\002\001\001\000\002\001\001\000\002\001\001\000\116" +
+    "\003\204\004\105\062\177\063\130\064\163\065\052\070" +
+    "\135\074\016\100\u0429\107\140\110\146\115\214\116\066" +
+    "\117\200\120\155\131\111\141\101\161\134\162\045\163" +
+    "\023\164\145\165\103\166\061\167\114\171\073\212\024" +
+    "\241\201\243\122\244\006\246\022\251\142\257\115\262" +
+    "\034\263\041\264\051\275\060\277\065\300\227\001\001" +
+    "\000\002\001\001\000\002\001\001\000\002\001\001\000" +
+    "\002\001\001\000\002\001\001\000\002\001\001\000\002" +
     "\001\001\000\116\003\204\004\105\062\177\063\130\064" +
-    "\163\065\052\070\135\074\016\100\u0475\107\140\110\146" +
+    "\163\065\052\070\135\074\016\100\u0430\107\140\110\146" +
     "\115\214\116\066\117\200\120\155\131\111\141\101\161" +
     "\134\162\045\163\023\164\145\165\103\166\061\167\114" +
     "\171\073\212\024\241\201\243\122\244\006\246\022\251" +
     "\142\257\115\262\034\263\041\264\051\275\060\277\065" +
     "\300\227\001\001\000\002\001\001\000\002\001\001\000" +
-    "\002\001\001\000\116\003\204\004\105\062\177\063\130" +
-    "\064\163\065\052\070\135\074\016\100\u0478\107\140\110" +
-    "\146\115\214\116\066\117\200\120\155\131\111\141\101" +
-    "\161\134\162\045\163\023\164\145\165\103\166\061\167" +
-    "\114\171\073\212\024\241\201\243\122\244\006\246\022" +
-    "\251\142\257\115\262\034\263\041\264\051\275\060\277" +
-    "\065\300\227\001\001\000\002\001\001\000\002\001\001" +
+    "\002\001\001\000\002\001\001\000\004\154\u0435\001\001" +
+    "\000\024\155\u0439\204\u0437\242\u043e\253\u027e\254\u043a\255" +
+    "\u027a\277\065\300\u0438\305\u0436\001\001\000\002\001\001" +
+    "\000\002\001\001\000\020\204\u0437\242\u043e\253\u027e\254" +
+    "\u043a\255\u027a\277\u02d2\305\u0444\001\001\000\002\001\001" +
+    "\000\006\253\u02cb\255\u02ca\001\001\000\002\001\001\000" +
+    "\002\001\001\000\010\003\u02a2\145\u0442\160\u02a1\001\001" +
+    "\000\016\003\u026e\172\u028e\231\u043f\233\u028f\235\u0290\237" +
+    "\u028a\001\001\000\004\173\u0440\001\001\000\002\001\001" +
+    "\000\002\001\001\000\004\146\u0443\001\001\000\002\001" +
+    "\001\000\002\001\001\000\004\055\u0446\001\001\000\012" +
+    "\174\u018d\175\u0191\176\u0181\177\u0447\001\001\000\002\001" +
+    "\001\000\024\041\u0449\044\u02e9\045\u02ec\202\u02ed\203\u02e8" +
+    "\254\u02e7\277\065\300\u02ea\306\u02eb\001\001\000\002\001" +
+    "\001\000\004\240\u044b\001\001\000\004\205\u044c\001\001" +
     "\000\002\001\001\000\002\001\001\000\002\001\001\000" +
-    "\002\001\001\000\004\142\u0487\001\001\000\010\140\u0483" +
-    "\142\u0484\251\u0482\001\001\000\004\142\u0481\001\001\000" +
-    "\002\001\001\000\002\001\001\000\002\001\001\000\002" +
-    "\001\001\000\002\001\001\000\002\001\001\000\002\001" +
-    "\001\000\004\142\u0489\001\001\000\002\001\001\000\024" +
-    "\041\u048b\044\u02e9\045\u02ec\202\u02ed\203\u02e8\254\u02e7\277" +
-    "\065\300\u02ea\306\u02eb\001\001\000\002\001\001\000\004" +
-    "\240\u048d\001\001\000\002\001\001\000\004\015\u048f\001" +
-    "\001\000\150\003\204\004\105\014\u02fb\016\u02f6\017\136" +
-    "\062\177\063\130\064\163\065\052\070\135\074\016\100" +
-    "\020\102\106\105\175\106\207\107\140\110\146\115\214" +
-    "\116\066\117\200\120\155\131\111\141\101\143\143\161" +
-    "\134\162\045\163\023\164\145\165\103\166\061\167\114" +
-    "\171\073\210\126\211\160\212\024\223\171\224\026\225" +
-    "\055\241\201\243\122\244\006\246\022\251\142\257\115" +
-    "\262\034\263\041\264\051\275\060\277\065\300\u02fa\303" +
-    "\u02f8\001\001\000\002\001\001\000\002\001\001\000\002" +
-    "\001\001\000\002\001\001\000\116\003\204\004\105\062" +
-    "\u0496\063\130\064\163\065\052\070\135\074\016\100\231" +
-    "\107\140\110\146\115\214\116\066\117\200\120\155\131" +
-    "\111\141\101\161\134\162\045\163\023\164\145\165\103" +
-    "\166\061\167\114\171\073\212\u0495\241\201\243\122\244" +
-    "\006\246\022\251\142\257\115\262\034\263\041\264\051" +
-    "\275\060\277\065\300\227\001\001\000\002\001\001\000" +
-    "\002\001\001\000\054\003\u0113\024\u0498\064\163\065\052" +
-    "\115\u0110\116\066\117\u010a\120\155\131\111\162\045\165" +
-    "\u010b\166\061\171\u010d\212\u049a\244\006\246\022\251\142" +
-    "\262\034\263\041\264\051\275\060\001\001\000\004\023" +
-    "\u04a3\001\001\000\126\003\204\004\105\062\177\063\130" +
-    "\064\163\065\052\070\135\074\016\100\u0351\107\140\110" +
-    "\146\115\214\116\066\117\200\120\155\131\111\132\u04a1" +
-    "\133\u0352\134\u0354\135\u0353\141\101\161\134\162\045\163" +
-    "\023\164\145\165\103\166\061\167\114\171\073\212\024" +
-    "\241\201\243\122\244\006\246\022\251\142\257\115\262" +
-    "\034\263\041\264\051\275\060\277\065\300\227\001\001" +
-    "\000\002\001\001\000\052\003\u0113\064\163\065\052\115" +
-    "\u0110\116\066\117\u010a\120\155\131\111\162\045\165\u010b" +
-    "\166\061\171\u010d\212\u04a0\244\006\246\022\251\142\262" +
-    "\034\263\041\264\051\275\060\001\001\000\002\001\001" +
-    "\000\126\003\204\004\105\062\177\063\130\064\163\065" +
-    "\052\070\135\074\016\100\u0351\107\140\110\146\115\214" +
-    "\116\066\117\200\120\155\131\111\132\u049e\133\u0352\134" +
-    "\u0354\135\u0353\141\101\161\134\162\045\163\023\164\145" +
-    "\165\103\166\061\167\114\171\073\212\024\241\201\243" +
-    "\122\244\006\246\022\251\142\257\115\262\034\263\041" +
-    "\264\051\275\060\277\065\300\227\001\001\000\002\001" +
-    "\001\000\002\001\001\000\002\001\001\000\002\001\001" +
-    "\000\002\001\001\000\002\001\001\000\054\003\u0113\024" +
-    "\u04a5\064\163\065\052\115\u0110\116\066\117\u010a\120\155" +
-    "\131\111\162\045\165\u010b\166\061\171\u010d\212\u049a\244" +
-    "\006\246\022\251\142\262\034\263\041\264\051\275\060" +
-    "\001\001\000\002\001\001\000\132\003\204\004\105\014" +
-    "\u04a8\017\136\026\u04a9\062\177\063\130\064\163\065\052" +
-    "\070\135\074\016\100\020\102\106\105\175\106\207\107" +
-    "\140\110\146\115\214\116\066\117\200\120\155\131\111" +
-    "\141\101\161\134\162\045\163\023\164\145\165\103\166" +
-    "\061\167\114\171\073\212\024\241\201\243\122\244\006" +
-    "\246\022\251\142\257\115\262\034\263\041\264\051\275" +
-    "\060\277\065\300\227\001\001\000\004\015\u04aa\001\001" +
-    "\000\002\001\001\000\002\001\001\000\150\003\204\004" +
-    "\105\014\u02fb\016\u02f6\017\136\062\177\063\130\064\163" +
-    "\065\052\070\135\074\016\100\020\102\106\105\175\106" +
-    "\207\107\140\110\146\115\214\116\066\117\200\120\155" +
-    "\131\111\141\101\143\143\161\134\162\045\163\023\164" +
-    "\145\165\103\166\061\167\114\171\073\210\126\211\160" +
-    "\212\024\223\171\224\026\225\055\241\201\243\122\244" +
-    "\006\246\022\251\142\257\115\262\034\263\041\264\051" +
-    "\275\060\277\065\300\u02fa\303\u02f8\001\001\000\002\001" +
-    "\001\000\002\001\001\000\054\003\u0113\024\u04ae\064\163" +
-    "\065\052\115\u0110\116\066\117\u010a\120\155\131\111\162" +
-    "\045\165\u010b\166\061\171\u010d\212\u049a\244\006\246\022" +
-    "\251\142\262\034\263\041\264\051\275\060\001\001\000" +
-    "\004\023\u04af\001\001\000\002\001\001\000\132\003\204" +
-    "\004\105\014\u04a8\017\136\026\u04b1\062\177\063\130\064" +
-    "\163\065\052\070\135\074\016\100\020\102\106\105\175" +
-    "\106\207\107\140\110\146\115\214\116\066\117\200\120" +
-    "\155\131\111\141\101\161\134\162\045\163\023\164\145" +
-    "\165\103\166\061\167\114\171\073\212\024\241\201\243" +
-    "\122\244\006\246\022\251\142\257\115\262\034\263\041" +
-    "\264\051\275\060\277\065\300\227\001\001\000\002\001" +
-    "\001\000\002\001\001\000\002\001\001\000\004\012\u04ba" +
-    "\001\001\000\002\001\001\000\004\012\u04b8\001\001\000" +
-    "\002\001\001\000\152\003\204\004\105\013\216\014\210" +
-    "\017\136\062\177\063\130\064\163\065\052\070\135\074" +
-    "\016\100\020\102\106\105\175\106\207\107\140\110\146" +
-    "\115\214\116\066\117\200\120\155\131\111\141\101\143" +
-    "\143\161\134\162\045\163\023\164\145\165\103\166\061" +
-    "\167\114\171\073\201\144\210\126\211\160\212\024\223" +
-    "\171\224\026\225\055\241\201\243\122\244\006\246\022" +
-    "\251\142\257\115\262\034\263\041\264\051\275\060\277" +
-    "\065\300\152\303\141\001\001\000\002\001\001\000\152" +
-    "\003\204\004\105\013\216\014\210\017\136\062\177\063" +
-    "\130\064\163\065\052\070\135\074\016\100\020\102\106" +
-    "\105\175\106\207\107\140\110\146\115\214\116\066\117" +
-    "\200\120\155\131\111\141\101\143\143\161\134\162\045" +
-    "\163\023\164\145\165\103\166\061\167\114\171\073\201" +
-    "\144\210\126\211\160\212\024\223\171\224\026\225\055" +
-    "\241\201\243\122\244\006\246\022\251\142\257\115\262" +
-    "\034\263\041\264\051\275\060\277\065\300\152\303\141" +
-    "\001\001\000\002\001\001\000\056\003\u0113\020\u04be\021" +
-    "\u04bd\064\163\065\052\115\u0110\116\066\117\u010a\120\155" +
-    "\131\111\162\045\165\u010b\166\061\171\u010d\212\u04bf\244" +
-    "\006\246\022\251\142\262\034\263\041\264\051\275\060" +
-    "\001\001\000\002\001\001\000\004\076\u04c1\001\001\000" +
-    "\002\001\001\000\054\003\u0113\021\u04c4\064\163\065\052" +
-    "\115\u0110\116\066\117\u010a\120\155\131\111\162\045\165" +
-    "\u010b\166\061\171\u010d\212\u04bf\244\006\246\022\251\142" +
-    "\262\034\263\041\264\051\275\060\001\001\000\002\001" +
-    "\001\000\002\001\001\000\002\001\001\000\002\001\001" +
-    "\000\004\067\u04c6\001\001\000\002\001\001\000\002\001" +
-    "\001\000\002\001\001\000\002\001\001\000\004\122\u012c" +
-    "\001\001\000\002\001\001\000\002\001\001\000\002\001" +
-    "\001\000\002\001\001\000\002\001\001\000\002\001\001" +
-    "\000\150\003\204\004\105\014\u02fb\016\u02f6\017\136\062" +
-    "\177\063\130\064\163\065\052\070\135\074\016\100\020" +
-    "\102\106\105\175\106\207\107\140\110\146\115\214\116" +
-    "\066\117\200\120\155\131\111\141\101\143\143\161\134" +
-    "\162\045\163\023\164\145\165\103\166\061\167\114\171" +
-    "\073\210\126\211\160\212\024\223\171\224\026\225\055" +
-    "\241\201\243\122\244\006\246\022\251\142\257\115\262" +
-    "\034\263\041\264\051\275\060\277\065\300\u02fa\303\u02f8" +
-    "\001\001\000\002\001\001\000\002\001\001\000\002\001" +
-    "\001\000\024\041\u04d6\044\u02e9\045\u02ec\202\u02ed\203\u02e8" +
+    "\002\001\001\000\002\001\001\000\004\142\u0453\001\001" +
+    "\000\002\001\001\000\002\001\001\000\030\003\u01af\004" +
+    "\u01a6\070\u019e\072\u0455\073\u01aa\161\u01ac\171\u019a\267\u01a4" +
+    "\271\u019b\272\u01a0\274\u01ae\001\001\000\002\001\001\000" +
+    "\004\144\u0457\001\001\000\002\001\001\000\010\003\u026e" +
+    "\172\u026d\230\u0459\001\001\000\002\001\001\000\004\156" +
+    "\u045b\001\001\000\016\157\u045e\203\u045d\204\u0461\253\u0460" +
+    "\254\u045c\255\u027a\001\001\000\006\253\u046e\255\u02ca\001" +
+    "\001\000\004\200\u046c\001\001\000\002\001\001\000\002" +
+    "\001\001\000\006\254\u046b\255\u02ce\001\001\000\002\001" +
+    "\001\000\002\001\001\000\004\055\u0464\001\001\000\012" +
+    "\174\u018d\175\u0191\176\u0181\177\u0465\001\001\000\002\001" +
+    "\001\000\024\041\u0467\044\u02e9\045\u02ec\202\u02ed\203\u02e8" +
     "\254\u02e7\277\065\300\u02ea\306\u02eb\001\001\000\002\001" +
-    "\001\000\004\240\u04d8\001\001\000\002\001\001\000\126" +
-    "\003\204\004\105\062\177\063\130\064\163\065\052\070" +
-    "\135\074\016\100\020\102\u031c\103\u04da\105\175\106\207" +
-    "\107\140\110\146\115\214\116\066\117\200\120\155\131" +
-    "\111\141\101\161\134\162\045\163\023\164\145\165\103" +
-    "\166\061\167\114\171\073\212\024\241\201\243\122\244" +
-    "\006\246\022\251\142\257\115\262\034\263\041\264\051" +
-    "\275\060\277\065\300\227\001\001\000\002\001\001\000" +
-    "\002\001\001\000\026\116\u012b\120\155\131\u0127\174\u018d" +
-    "\175\u0191\176\u0181\177\u04de\244\u0237\251\142\260\u04dd\001" +
-    "\001\000\004\122\u03f5\001\001\000\002\001\001\000\006" +
-    "\137\u0470\251\u046f\001\001\000\002\001\001\000\002\001" +
-    "\001\000\002\001\001\000\002\001\001\000\002\001\001" +
-    "\000\002\001\001\000\002\001\001\000\116\003\204\004" +
+    "\001\000\004\240\u0469\001\001\000\002\001\001\000\002" +
+    "\001\001\000\004\255\u02d0\001\001\000\002\001\001\000" +
+    "\002\001\001\000\004\255\u02cc\001\001\000\006\137\u0471" +
+    "\251\u0470\001\001\000\002\001\001\000\002\001\001\000" +
+    "\002\001\001\000\052\003\u0113\064\163\065\052\115\u0110" +
+    "\116\066\117\u010a\120\155\131\111\162\045\165\u010b\166" +
+    "\061\171\u010d\212\u047d\244\006\246\022\251\142\262\034" +
+    "\263\041\264\051\275\060\001\001\000\116\003\204\004" +
     "\105\062\177\063\130\064\163\065\052\070\135\074\016" +
-    "\100\u04e8\107\140\110\146\115\214\116\066\117\200\120" +
+    "\100\u0476\107\140\110\146\115\214\116\066\117\200\120" +
     "\155\131\111\141\101\161\134\162\045\163\023\164\145" +
     "\165\103\166\061\167\114\171\073\212\024\241\201\243" +
     "\122\244\006\246\022\251\142\257\115\262\034\263\041" +
     "\264\051\275\060\277\065\300\227\001\001\000\002\001" +
-    "\001\000\002\001\001\000\024\116\u012b\120\155\126\u04f0" +
-    "\127\u0126\130\u0123\131\u0127\142\u0122\244\u0124\251\142\001" +
-    "\001\000\024\116\u012b\120\155\126\u04ec\127\u0126\130\u0123" +
-    "\131\u0127\142\u0122\244\u0124\251\142\001\001\000\004\206" +
-    "\u04ed\001\001\000\006\122\u013a\124\u04ee\001\001\000\006" +
-    "\122\u013c\207\u04ef\001\001\000\004\245\u013f\001\001\000" +
-    "\004\206\u04f1\001\001\000\006\122\u013a\124\u04f2\001\001" +
-    "\000\006\122\u013c\207\u04f3\001\001\000\004\245\u013f\001" +
-    "\001\000\116\003\204\004\105\062\177\063\130\064\163" +
-    "\065\052\070\135\074\016\100\u04f5\107\140\110\146\115" +
-    "\214\116\066\117\200\120\155\131\111\141\101\161\134" +
+    "\001\000\002\001\001\000\002\001\001\000\116\003\204" +
+    "\004\105\062\177\063\130\064\163\065\052\070\135\074" +
+    "\016\100\u0479\107\140\110\146\115\214\116\066\117\200" +
+    "\120\155\131\111\141\101\161\134\162\045\163\023\164" +
+    "\145\165\103\166\061\167\114\171\073\212\024\241\201" +
+    "\243\122\244\006\246\022\251\142\257\115\262\034\263" +
+    "\041\264\051\275\060\277\065\300\227\001\001\000\002" +
+    "\001\001\000\002\001\001\000\002\001\001\000\002\001" +
+    "\001\000\002\001\001\000\002\001\001\000\004\142\u0488" +
+    "\001\001\000\010\140\u0484\142\u0485\251\u0483\001\001\000" +
+    "\004\142\u0482\001\001\000\002\001\001\000\002\001\001" +
+    "\000\002\001\001\000\002\001\001\000\002\001\001\000" +
+    "\002\001\001\000\002\001\001\000\004\142\u048a\001\001" +
+    "\000\002\001\001\000\024\041\u048c\044\u02e9\045\u02ec\202" +
+    "\u02ed\203\u02e8\254\u02e7\277\065\300\u02ea\306\u02eb\001\001" +
+    "\000\002\001\001\000\004\240\u048e\001\001\000\002\001" +
+    "\001\000\004\015\u0490\001\001\000\150\003\204\004\105" +
+    "\014\u02fb\016\u02f6\017\136\062\177\063\130\064\163\065" +
+    "\052\070\135\074\016\100\020\102\106\105\175\106\207" +
+    "\107\140\110\146\115\214\116\066\117\200\120\155\131" +
+    "\111\141\101\143\143\161\134\162\045\163\023\164\145" +
+    "\165\103\166\061\167\114\171\073\210\126\211\160\212" +
+    "\024\223\171\224\026\225\055\241\201\243\122\244\006" +
+    "\246\022\251\142\257\115\262\034\263\041\264\051\275" +
+    "\060\277\065\300\u02fa\303\u02f8\001\001\000\002\001\001" +
+    "\000\002\001\001\000\002\001\001\000\002\001\001\000" +
+    "\116\003\204\004\105\062\u0497\063\130\064\163\065\052" +
+    "\070\135\074\016\100\231\107\140\110\146\115\214\116" +
+    "\066\117\200\120\155\131\111\141\101\161\134\162\045" +
+    "\163\023\164\145\165\103\166\061\167\114\171\073\212" +
+    "\u0496\241\201\243\122\244\006\246\022\251\142\257\115" +
+    "\262\034\263\041\264\051\275\060\277\065\300\227\001" +
+    "\001\000\002\001\001\000\002\001\001\000\054\003\u0113" +
+    "\024\u0499\064\163\065\052\115\u0110\116\066\117\u010a\120" +
+    "\155\131\111\162\045\165\u010b\166\061\171\u010d\212\u049b" +
+    "\244\006\246\022\251\142\262\034\263\041\264\051\275" +
+    "\060\001\001\000\004\023\u04a4\001\001\000\126\003\204" +
+    "\004\105\062\177\063\130\064\163\065\052\070\135\074" +
+    "\016\100\u0352\107\140\110\146\115\214\116\066\117\200" +
+    "\120\155\131\111\132\u04a2\133\u0353\134\u0355\135\u0354\141" +
+    "\101\161\134\162\045\163\023\164\145\165\103\166\061" +
+    "\167\114\171\073\212\024\241\201\243\122\244\006\246" +
+    "\022\251\142\257\115\262\034\263\041\264\051\275\060" +
+    "\277\065\300\227\001\001\000\002\001\001\000\052\003" +
+    "\u0113\064\163\065\052\115\u0110\116\066\117\u010a\120\155" +
+    "\131\111\162\045\165\u010b\166\061\171\u010d\212\u04a1\244" +
+    "\006\246\022\251\142\262\034\263\041\264\051\275\060" +
+    "\001\001\000\002\001\001\000\126\003\204\004\105\062" +
+    "\177\063\130\064\163\065\052\070\135\074\016\100\u0352" +
+    "\107\140\110\146\115\214\116\066\117\200\120\155\131" +
+    "\111\132\u049f\133\u0353\134\u0355\135\u0354\141\101\161\134" +
     "\162\045\163\023\164\145\165\103\166\061\167\114\171" +
     "\073\212\024\241\201\243\122\244\006\246\022\251\142" +
     "\257\115\262\034\263\041\264\051\275\060\277\065\300" +
-    "\227\001\001\000\002\001\001\000\002\001\001\000\004" +
-    "\226\u04f8\001\001\000\004\227\u04f9\001\001\000\002\001" +
-    "\001\000\004\053\u04fb\001\001\000\026\054\u027f\203\u0278" +
-    "\204\u0277\242\u0287\253\u027e\254\u0280\255\u027a\277\065\300" +
-    "\u027d\304\u0276\001\001\000\002\001\001\000\116\003\204" +
-    "\004\105\062\177\063\130\064\163\065\052\070\135\074" +
-    "\016\100\u04fe\107\140\110\146\115\214\116\066\117\200" +
-    "\120\155\131\111\141\101\161\134\162\045\163\023\164" +
-    "\145\165\103\166\061\167\114\171\073\212\024\241\201" +
-    "\243\122\244\006\246\022\251\142\257\115\262\034\263" +
-    "\041\264\051\275\060\277\065\300\227\001\001\000\002" +
-    "\001\001\000\132\003\204\004\105\014\u0502\017\136\034" +
-    "\u0501\062\177\063\130\064\163\065\052\070\135\074\016" +
+    "\227\001\001\000\002\001\001\000\002\001\001\000\002" +
+    "\001\001\000\002\001\001\000\002\001\001\000\002\001" +
+    "\001\000\054\003\u0113\024\u04a6\064\163\065\052\115\u0110" +
+    "\116\066\117\u010a\120\155\131\111\162\045\165\u010b\166" +
+    "\061\171\u010d\212\u049b\244\006\246\022\251\142\262\034" +
+    "\263\041\264\051\275\060\001\001\000\002\001\001\000" +
+    "\132\003\204\004\105\014\u04a9\017\136\026\u04aa\062\177" +
+    "\063\130\064\163\065\052\070\135\074\016\100\020\102" +
+    "\106\105\175\106\207\107\140\110\146\115\214\116\066" +
+    "\117\200\120\155\131\111\141\101\161\134\162\045\163" +
+    "\023\164\145\165\103\166\061\167\114\171\073\212\024" +
+    "\241\201\243\122\244\006\246\022\251\142\257\115\262" +
+    "\034\263\041\264\051\275\060\277\065\300\227\001\001" +
+    "\000\004\015\u04ab\001\001\000\002\001\001\000\002\001" +
+    "\001\000\150\003\204\004\105\014\u02fb\016\u02f6\017\136" +
+    "\062\177\063\130\064\163\065\052\070\135\074\016\100" +
+    "\020\102\106\105\175\106\207\107\140\110\146\115\214" +
+    "\116\066\117\200\120\155\131\111\141\101\143\143\161" +
+    "\134\162\045\163\023\164\145\165\103\166\061\167\114" +
+    "\171\073\210\126\211\160\212\024\223\171\224\026\225" +
+    "\055\241\201\243\122\244\006\246\022\251\142\257\115" +
+    "\262\034\263\041\264\051\275\060\277\065\300\u02fa\303" +
+    "\u02f8\001\001\000\002\001\001\000\002\001\001\000\054" +
+    "\003\u0113\024\u04af\064\163\065\052\115\u0110\116\066\117" +
+    "\u010a\120\155\131\111\162\045\165\u010b\166\061\171\u010d" +
+    "\212\u049b\244\006\246\022\251\142\262\034\263\041\264" +
+    "\051\275\060\001\001\000\004\023\u04b0\001\001\000\002" +
+    "\001\001\000\132\003\204\004\105\014\u04a9\017\136\026" +
+    "\u04b2\062\177\063\130\064\163\065\052\070\135\074\016" +
     "\100\020\102\106\105\175\106\207\107\140\110\146\115" +
     "\214\116\066\117\200\120\155\131\111\141\101\161\134" +
     "\162\045\163\023\164\145\165\103\166\061\167\114\171" +
     "\073\212\024\241\201\243\122\244\006\246\022\251\142" +
     "\257\115\262\034\263\041\264\051\275\060\277\065\300" +
-    "\227\001\001\000\004\015\u0503\001\001\000\002\001\001" +
-    "\000\002\001\001\000\150\003\204\004\105\014\u02fb\016" +
-    "\u02f6\017\136\062\177\063\130\064\163\065\052\070\135" +
+    "\227\001\001\000\002\001\001\000\002\001\001\000\002" +
+    "\001\001\000\004\012\u04bb\001\001\000\002\001\001\000" +
+    "\004\012\u04b9\001\001\000\002\001\001\000\152\003\204" +
+    "\004\105\013\216\014\210\017\136\062\177\063\130\064" +
+    "\163\065\052\070\135\074\016\100\020\102\106\105\175" +
+    "\106\207\107\140\110\146\115\214\116\066\117\200\120" +
+    "\155\131\111\141\101\143\143\161\134\162\045\163\023" +
+    "\164\145\165\103\166\061\167\114\171\073\201\144\210" +
+    "\126\211\160\212\024\223\171\224\026\225\055\241\201" +
+    "\243\122\244\006\246\022\251\142\257\115\262\034\263" +
+    "\041\264\051\275\060\277\065\300\152\303\141\001\001" +
+    "\000\002\001\001\000\152\003\204\004\105\013\216\014" +
+    "\210\017\136\062\177\063\130\064\163\065\052\070\135" +
     "\074\016\100\020\102\106\105\175\106\207\107\140\110" +
     "\146\115\214\116\066\117\200\120\155\131\111\141\101" +
     "\143\143\161\134\162\045\163\023\164\145\165\103\166" +
-    "\061\167\114\171\073\210\126\211\160\212\024\223\171" +
-    "\224\026\225\055\241\201\243\122\244\006\246\022\251" +
-    "\142\257\115\262\034\263\041\264\051\275\060\277\065" +
-    "\300\u02fa\303\u02f8\001\001\000\002\001\001\000\002\001" +
-    "\001\000\010\046\u050d\047\350\056\351\001\001\000\032" +
-    "\116\u012b\120\155\125\u0509\131\u0127\174\u018d\175\u0191\176" +
-    "\u0181\177\u0170\244\u0145\251\142\270\u0195\273\u014d\001\001" +
-    "\000\002\001\001\000\004\206\u050a\001\001\000\006\122" +
-    "\u013a\124\u050b\001\001\000\006\122\u013c\207\u050c\001\001" +
-    "\000\004\245\u013f\001\001\000\002\001\001\000\002\001" +
-    "\001\000\032\116\u012b\120\155\125\u0510\131\u0127\174\u018d" +
-    "\175\u0191\176\u0181\177\u0170\244\u0145\251\142\270\u0195\273" +
-    "\u014d\001\001\000\004\206\u0511\001\001\000\006\122\u013a" +
-    "\124\u0512\001\001\000\006\122\u013c\207\u0513\001\001\000" +
-    "\004\245\u013f\001\001\000\002\001\001\000\002\001\001" +
-    "\000\002\001\001\000\002\001\001\000\002\001\001\000" +
-    "\032\003\u01af\004\u01a6\070\u019e\071\u051a\072\u01f8\073\u01aa" +
-    "\161\u01ac\171\u019a\267\u01a4\271\u019b\272\u01a0\274\u01ae\001" +
-    "\001\000\002\001\001\000\032\003\u01af\004\u01a6\070\u019e" +
-    "\071\u051c\072\u01f8\073\u01aa\161\u01ac\171\u019a\267\u01a4\271" +
-    "\u019b\272\u01a0\274\u01ae\001\001\000\002\001\001\000\002" +
-    "\001\001\000\004\015\u051f\001\001\000\150\003\204\004" +
-    "\105\014\u02fb\016\u02f6\017\136\062\177\063\130\064\163" +
-    "\065\052\070\135\074\016\100\020\102\106\105\175\106" +
-    "\207\107\140\110\146\115\214\116\066\117\200\120\155" +
-    "\131\111\141\101\143\143\161\134\162\045\163\023\164" +
-    "\145\165\103\166\061\167\114\171\073\210\126\211\160" +
-    "\212\024\223\171\224\026\225\055\241\201\243\122\244" +
-    "\006\246\022\251\142\257\115\262\034\263\041\264\051" +
-    "\275\060\277\065\300\u02fa\303\u02f8\001\001\000\002\001" +
-    "\001\000\002\001\001\000\002\001\001\000\004\015\u0524" +
-    "\001\001\000\150\003\204\004\105\014\u02fb\016\u02f6\017" +
-    "\136\062\177\063\130\064\163\065\052\070\135\074\016" +
-    "\100\020\102\106\105\175\106\207\107\140\110\146\115" +
-    "\214\116\066\117\200\120\155\131\111\141\101\143\143" +
-    "\161\134\162\045\163\023\164\145\165\103\166\061\167" +
-    "\114\171\073\210\126\211\160\212\024\223\171\224\026" +
-    "\225\055\241\201\243\122\244\006\246\022\251\142\257" +
-    "\115\262\034\263\041\264\051\275\060\277\065\300\u02fa" +
-    "\303\u02f8\001\001\000\002\001\001\000\010\003\u026e\172" +
-    "\u0528\216\u0527\001\001\000\006\251\u052f\252\u0530\001\001" +
-    "\000\010\217\u0529\220\u052c\221\u052b\001\001\000\002\001" +
-    "\001\000\006\003\u026e\172\u052e\001\001\000\002\001\001" +
-    "\000\004\221\u052d\001\001\000\002\001\001\000\002\001" +
-    "\001\000\002\001\001\000\002\001\001\000\002\001\001" +
-    "\000\004\015\u0533\001\001\000\150\003\204\004\105\014" +
+    "\061\167\114\171\073\201\144\210\126\211\160\212\024" +
+    "\223\171\224\026\225\055\241\201\243\122\244\006\246" +
+    "\022\251\142\257\115\262\034\263\041\264\051\275\060" +
+    "\277\065\300\152\303\141\001\001\000\002\001\001\000" +
+    "\056\003\u0113\020\u04bf\021\u04be\064\163\065\052\115\u0110" +
+    "\116\066\117\u010a\120\155\131\111\162\045\165\u010b\166" +
+    "\061\171\u010d\212\u04c0\244\006\246\022\251\142\262\034" +
+    "\263\041\264\051\275\060\001\001\000\002\001\001\000" +
+    "\004\076\u04c2\001\001\000\002\001\001\000\054\003\u0113" +
+    "\021\u04c5\064\163\065\052\115\u0110\116\066\117\u010a\120" +
+    "\155\131\111\162\045\165\u010b\166\061\171\u010d\212\u04c0" +
+    "\244\006\246\022\251\142\262\034\263\041\264\051\275" +
+    "\060\001\001\000\002\001\001\000\002\001\001\000\002" +
+    "\001\001\000\002\001\001\000\004\067\u04c7\001\001\000" +
+    "\002\001\001\000\002\001\001\000\002\001\001\000\002" +
+    "\001\001\000\004\122\u012c\001\001\000\002\001\001\000" +
+    "\002\001\001\000\002\001\001\000\002\001\001\000\002" +
+    "\001\001\000\002\001\001\000\150\003\204\004\105\014" +
     "\u02fb\016\u02f6\017\136\062\177\063\130\064\163\065\052" +
     "\070\135\074\016\100\020\102\106\105\175\106\207\107" +
     "\140\110\146\115\214\116\066\117\200\120\155\131\111" +
@@ -1838,67 +1724,89 @@ public class ASTPHP5Parser extends java_cup.runtime.lr_parser {
     "\103\166\061\167\114\171\073\210\126\211\160\212\024" +
     "\223\171\224\026\225\055\241\201\243\122\244\006\246" +
     "\022\251\142\257\115\262\034\263\041\264\051\275\060" +
-    "\277\065\300\u02fa\303\u02f8\001\001\000\010\213\u0536\214" +
-    "\u0538\215\u0537\001\001\000\002\001\001\000\004\222\u053a" +
-    "\001\001\000\002\001\001\000\004\215\u0539\001\001\000" +
-    "\002\001\001\000\002\001\001\000\002\001\001\000\004" +
-    "\015\u053d\001\001\000\150\003\204\004\105\014\u02fb\016" +
-    "\u02f6\017\136\062\177\063\130\064\163\065\052\070\135" +
-    "\074\016\100\020\102\106\105\175\106\207\107\140\110" +
-    "\146\115\214\116\066\117\200\120\155\131\111\141\101" +
-    "\143\143\161\134\162\045\163\023\164\145\165\103\166" +
-    "\061\167\114\171\073\210\126\211\160\212\024\223\171" +
-    "\224\026\225\055\241\201\243\122\244\006\246\022\251" +
-    "\142\257\115\262\034\263\041\264\051\275\060\277\065" +
-    "\300\u02fa\303\u02f8\001\001\000\002\001\001\000\010\003" +
-    "\u026e\172\u0528\216\u0540\001\001\000\006\251\u052f\252\u0541" +
-    "\001\001\000\002\001\001\000\002\001\001\000\004\015" +
-    "\u0544\001\001\000\150\003\204\004\105\014\u02fb\016\u02f6" +
-    "\017\136\062\177\063\130\064\163\065\052\070\135\074" +
-    "\016\100\020\102\106\105\175\106\207\107\140\110\146" +
-    "\115\214\116\066\117\200\120\155\131\111\141\101\143" +
-    "\143\161\134\162\045\163\023\164\145\165\103\166\061" +
-    "\167\114\171\073\210\126\211\160\212\024\223\171\224" +
-    "\026\225\055\241\201\243\122\244\006\246\022\251\142" +
-    "\257\115\262\034\263\041\264\051\275\060\277\065\300" +
-    "\u02fa\303\u02f8\001\001\000\002\001\001\000\002\001\001" +
-    "\000\002\001\001\000\006\137\u0470\251\u046f\001\001\000" +
-    "\002\001\001\000\002\001\001\000\122\003\204\004\105" +
-    "\060\u054d\061\u054e\062\177\063\130\064\163\065\052\070" +
-    "\135\074\016\100\u054c\107\140\110\146\115\214\116\066" +
-    "\117\200\120\155\131\111\141\101\161\134\162\045\163" +
-    "\023\164\145\165\103\166\061\167\114\171\073\212\024" +
-    "\241\201\243\122\244\006\246\022\251\142\257\115\262" +
-    "\034\263\041\264\051\275\060\277\065\300\227\001\001" +
-    "\000\002\001\001\000\002\001\001\000\002\001\001\000" +
-    "\116\003\204\004\105\062\177\063\130\064\163\065\052" +
-    "\070\135\074\016\100\u0550\107\140\110\146\115\214\116" +
+    "\277\065\300\u02fa\303\u02f8\001\001\000\002\001\001\000" +
+    "\002\001\001\000\002\001\001\000\024\041\u04d7\044\u02e9" +
+    "\045\u02ec\202\u02ed\203\u02e8\254\u02e7\277\065\300\u02ea\306" +
+    "\u02eb\001\001\000\002\001\001\000\004\240\u04d9\001\001" +
+    "\000\002\001\001\000\126\003\204\004\105\062\177\063" +
+    "\130\064\163\065\052\070\135\074\016\100\020\102\u031d" +
+    "\103\u04db\105\175\106\207\107\140\110\146\115\214\116" +
     "\066\117\200\120\155\131\111\141\101\161\134\162\045" +
     "\163\023\164\145\165\103\166\061\167\114\171\073\212" +
     "\024\241\201\243\122\244\006\246\022\251\142\257\115" +
     "\262\034\263\041\264\051\275\060\277\065\300\227\001" +
-    "\001\000\002\001\001\000\122\003\204\004\105\060\u0552" +
-    "\061\u054e\062\177\063\130\064\163\065\052\070\135\074" +
-    "\016\100\u054c\107\140\110\146\115\214\116\066\117\200" +
-    "\120\155\131\111\141\101\161\134\162\045\163\023\164" +
-    "\145\165\103\166\061\167\114\171\073\212\024\241\201" +
-    "\243\122\244\006\246\022\251\142\257\115\262\034\263" +
-    "\041\264\051\275\060\277\065\300\227\001\001\000\002" +
-    "\001\001\000\122\003\204\004\105\060\u0554\061\u054e\062" +
-    "\177\063\130\064\163\065\052\070\135\074\016\100\u054c" +
-    "\107\140\110\146\115\214\116\066\117\200\120\155\131" +
-    "\111\141\101\161\134\162\045\163\023\164\145\165\103" +
-    "\166\061\167\114\171\073\212\024\241\201\243\122\244" +
-    "\006\246\022\251\142\257\115\262\034\263\041\264\051" +
-    "\275\060\277\065\300\227\001\001\000\002\001\001\000" +
-    "\132\003\204\004\105\014\u0558\017\136\025\u0556\062\177" +
-    "\063\130\064\163\065\052\070\135\074\016\100\020\102" +
-    "\106\105\175\106\207\107\140\110\146\115\214\116\066" +
-    "\117\200\120\155\131\111\141\101\161\134\162\045\163" +
-    "\023\164\145\165\103\166\061\167\114\171\073\212\024" +
-    "\241\201\243\122\244\006\246\022\251\142\257\115\262" +
-    "\034\263\041\264\051\275\060\277\065\300\227\001\001" +
-    "\000\002\001\001\000\004\015\u0559\001\001\000\002\001" +
+    "\001\000\002\001\001\000\002\001\001\000\026\116\u012b" +
+    "\120\155\131\u0127\174\u018d\175\u0191\176\u0181\177\u04df\244" +
+    "\u0237\251\142\260\u04de\001\001\000\004\122\u03f6\001\001" +
+    "\000\002\001\001\000\006\137\u0471\251\u0470\001\001\000" +
+    "\002\001\001\000\002\001\001\000\002\001\001\000\002" +
+    "\001\001\000\002\001\001\000\002\001\001\000\002\001" +
+    "\001\000\116\003\204\004\105\062\177\063\130\064\163" +
+    "\065\052\070\135\074\016\100\u04e9\107\140\110\146\115" +
+    "\214\116\066\117\200\120\155\131\111\141\101\161\134" +
+    "\162\045\163\023\164\145\165\103\166\061\167\114\171" +
+    "\073\212\024\241\201\243\122\244\006\246\022\251\142" +
+    "\257\115\262\034\263\041\264\051\275\060\277\065\300" +
+    "\227\001\001\000\002\001\001\000\002\001\001\000\024" +
+    "\116\u012b\120\155\126\u04f1\127\u0126\130\u0123\131\u0127\142" +
+    "\u0122\244\u0124\251\142\001\001\000\024\116\u012b\120\155" +
+    "\126\u04ed\127\u0126\130\u0123\131\u0127\142\u0122\244\u0124\251" +
+    "\142\001\001\000\004\206\u04ee\001\001\000\006\122\u013a" +
+    "\124\u04ef\001\001\000\006\122\u013c\207\u04f0\001\001\000" +
+    "\004\245\u013f\001\001\000\004\206\u04f2\001\001\000\006" +
+    "\122\u013a\124\u04f3\001\001\000\006\122\u013c\207\u04f4\001" +
+    "\001\000\004\245\u013f\001\001\000\116\003\204\004\105" +
+    "\062\177\063\130\064\163\065\052\070\135\074\016\100" +
+    "\u04f6\107\140\110\146\115\214\116\066\117\200\120\155" +
+    "\131\111\141\101\161\134\162\045\163\023\164\145\165" +
+    "\103\166\061\167\114\171\073\212\024\241\201\243\122" +
+    "\244\006\246\022\251\142\257\115\262\034\263\041\264" +
+    "\051\275\060\277\065\300\227\001\001\000\002\001\001" +
+    "\000\002\001\001\000\004\226\u04f9\001\001\000\004\227" +
+    "\u04fa\001\001\000\002\001\001\000\004\053\u04fc\001\001" +
+    "\000\026\054\u027f\203\u0278\204\u0277\242\u0287\253\u027e\254" +
+    "\u0280\255\u027a\277\065\300\u027d\304\u0276\001\001\000\002" +
+    "\001\001\000\116\003\204\004\105\062\177\063\130\064" +
+    "\163\065\052\070\135\074\016\100\u04ff\107\140\110\146" +
+    "\115\214\116\066\117\200\120\155\131\111\141\101\161" +
+    "\134\162\045\163\023\164\145\165\103\166\061\167\114" +
+    "\171\073\212\024\241\201\243\122\244\006\246\022\251" +
+    "\142\257\115\262\034\263\041\264\051\275\060\277\065" +
+    "\300\227\001\001\000\002\001\001\000\132\003\204\004" +
+    "\105\014\u0503\017\136\034\u0502\062\177\063\130\064\163" +
+    "\065\052\070\135\074\016\100\020\102\106\105\175\106" +
+    "\207\107\140\110\146\115\214\116\066\117\200\120\155" +
+    "\131\111\141\101\161\134\162\045\163\023\164\145\165" +
+    "\103\166\061\167\114\171\073\212\024\241\201\243\122" +
+    "\244\006\246\022\251\142\257\115\262\034\263\041\264" +
+    "\051\275\060\277\065\300\227\001\001\000\004\015\u0504" +
+    "\001\001\000\002\001\001\000\002\001\001\000\150\003" +
+    "\204\004\105\014\u02fb\016\u02f6\017\136\062\177\063\130" +
+    "\064\163\065\052\070\135\074\016\100\020\102\106\105" +
+    "\175\106\207\107\140\110\146\115\214\116\066\117\200" +
+    "\120\155\131\111\141\101\143\143\161\134\162\045\163" +
+    "\023\164\145\165\103\166\061\167\114\171\073\210\126" +
+    "\211\160\212\024\223\171\224\026\225\055\241\201\243" +
+    "\122\244\006\246\022\251\142\257\115\262\034\263\041" +
+    "\264\051\275\060\277\065\300\u02fa\303\u02f8\001\001\000" +
+    "\002\001\001\000\002\001\001\000\010\046\u050e\047\350" +
+    "\056\351\001\001\000\032\116\u012b\120\155\125\u050a\131" +
+    "\u0127\174\u018d\175\u0191\176\u0181\177\u0170\244\u0145\251\142" +
+    "\270\u0195\273\u014d\001\001\000\002\001\001\000\004\206" +
+    "\u050b\001\001\000\006\122\u013a\124\u050c\001\001\000\006" +
+    "\122\u013c\207\u050d\001\001\000\004\245\u013f\001\001\000" +
+    "\002\001\001\000\002\001\001\000\032\116\u012b\120\155" +
+    "\125\u0511\131\u0127\174\u018d\175\u0191\176\u0181\177\u0170\244" +
+    "\u0145\251\142\270\u0195\273\u014d\001\001\000\004\206\u0512" +
+    "\001\001\000\006\122\u013a\124\u0513\001\001\000\006\122" +
+    "\u013c\207\u0514\001\001\000\004\245\u013f\001\001\000\002" +
+    "\001\001\000\002\001\001\000\002\001\001\000\002\001" +
+    "\001\000\002\001\001\000\032\003\u01af\004\u01a6\070\u019e" +
+    "\071\u051b\072\u01f8\073\u01aa\161\u01ac\171\u019a\267\u01a4\271" +
+    "\u019b\272\u01a0\274\u01ae\001\001\000\002\001\001\000\032" +
+    "\003\u01af\004\u01a6\070\u019e\071\u051d\072\u01f8\073\u01aa\161" +
+    "\u01ac\171\u019a\267\u01a4\271\u019b\272\u01a0\274\u01ae\001\001" +
+    "\000\002\001\001\000\002\001\001\000\004\015\u0520\001" +
     "\001\000\150\003\204\004\105\014\u02fb\016\u02f6\017\136" +
     "\062\177\063\130\064\163\065\052\070\135\074\016\100" +
     "\020\102\106\105\175\106\207\107\140\110\146\115\214" +
@@ -1907,111 +1815,203 @@ public class ASTPHP5Parser extends java_cup.runtime.lr_parser {
     "\171\073\210\126\211\160\212\024\223\171\224\026\225" +
     "\055\241\201\243\122\244\006\246\022\251\142\257\115" +
     "\262\034\263\041\264\051\275\060\277\065\300\u02fa\303" +
-    "\u02f8\001\001\000\002\001\001\000\002\001\001\000\116" +
-    "\003\204\004\105\062\u055e\063\130\064\163\065\052\070" +
-    "\135\074\016\100\231\107\140\110\146\115\214\116\066" +
-    "\117\200\120\155\131\111\141\101\161\134\162\045\163" +
-    "\023\164\145\165\103\166\061\167\114\171\073\212\u055d" +
-    "\241\201\243\122\244\006\246\022\251\142\257\115\262" +
-    "\034\263\041\264\051\275\060\277\065\300\227\001\001" +
-    "\000\002\001\001\000\002\001\001\000\002\001\001\000" +
+    "\u02f8\001\001\000\002\001\001\000\002\001\001\000\002" +
+    "\001\001\000\004\015\u0525\001\001\000\150\003\204\004" +
+    "\105\014\u02fb\016\u02f6\017\136\062\177\063\130\064\163" +
+    "\065\052\070\135\074\016\100\020\102\106\105\175\106" +
+    "\207\107\140\110\146\115\214\116\066\117\200\120\155" +
+    "\131\111\141\101\143\143\161\134\162\045\163\023\164" +
+    "\145\165\103\166\061\167\114\171\073\210\126\211\160" +
+    "\212\024\223\171\224\026\225\055\241\201\243\122\244" +
+    "\006\246\022\251\142\257\115\262\034\263\041\264\051" +
+    "\275\060\277\065\300\u02fa\303\u02f8\001\001\000\002\001" +
+    "\001\000\010\003\u026e\172\u0529\216\u0528\001\001\000\006" +
+    "\251\u0530\252\u0531\001\001\000\010\217\u052a\220\u052d\221" +
+    "\u052c\001\001\000\002\001\001\000\006\003\u026e\172\u052f" +
+    "\001\001\000\002\001\001\000\004\221\u052e\001\001\000" +
     "\002\001\001\000\002\001\001\000\002\001\001\000\002" +
-    "\001\001\000\004\076\u0566\001\001\000\010\003\331\171" +
-    "\u0563\301\u0568\001\001\000\002\001\001\000\002\001\001" +
-    "\000\002\001\001\000\010\046\u056a\047\350\056\351\001" +
+    "\001\001\000\002\001\001\000\004\015\u0534\001\001\000" +
+    "\150\003\204\004\105\014\u02fb\016\u02f6\017\136\062\177" +
+    "\063\130\064\163\065\052\070\135\074\016\100\020\102" +
+    "\106\105\175\106\207\107\140\110\146\115\214\116\066" +
+    "\117\200\120\155\131\111\141\101\143\143\161\134\162" +
+    "\045\163\023\164\145\165\103\166\061\167\114\171\073" +
+    "\210\126\211\160\212\024\223\171\224\026\225\055\241" +
+    "\201\243\122\244\006\246\022\251\142\257\115\262\034" +
+    "\263\041\264\051\275\060\277\065\300\u02fa\303\u02f8\001" +
+    "\001\000\010\213\u0537\214\u0539\215\u0538\001\001\000\002" +
+    "\001\001\000\004\222\u053b\001\001\000\002\001\001\000" +
+    "\004\215\u053a\001\001\000\002\001\001\000\002\001\001" +
+    "\000\002\001\001\000\004\015\u053e\001\001\000\150\003" +
+    "\204\004\105\014\u02fb\016\u02f6\017\136\062\177\063\130" +
+    "\064\163\065\052\070\135\074\016\100\020\102\106\105" +
+    "\175\106\207\107\140\110\146\115\214\116\066\117\200" +
+    "\120\155\131\111\141\101\143\143\161\134\162\045\163" +
+    "\023\164\145\165\103\166\061\167\114\171\073\210\126" +
+    "\211\160\212\024\223\171\224\026\225\055\241\201\243" +
+    "\122\244\006\246\022\251\142\257\115\262\034\263\041" +
+    "\264\051\275\060\277\065\300\u02fa\303\u02f8\001\001\000" +
+    "\002\001\001\000\010\003\u026e\172\u0529\216\u0541\001\001" +
+    "\000\006\251\u0530\252\u0542\001\001\000\002\001\001\000" +
+    "\002\001\001\000\004\015\u0545\001\001\000\150\003\204" +
+    "\004\105\014\u02fb\016\u02f6\017\136\062\177\063\130\064" +
+    "\163\065\052\070\135\074\016\100\020\102\106\105\175" +
+    "\106\207\107\140\110\146\115\214\116\066\117\200\120" +
+    "\155\131\111\141\101\143\143\161\134\162\045\163\023" +
+    "\164\145\165\103\166\061\167\114\171\073\210\126\211" +
+    "\160\212\024\223\171\224\026\225\055\241\201\243\122" +
+    "\244\006\246\022\251\142\257\115\262\034\263\041\264" +
+    "\051\275\060\277\065\300\u02fa\303\u02f8\001\001\000\002" +
+    "\001\001\000\002\001\001\000\002\001\001\000\006\137" +
+    "\u0471\251\u0470\001\001\000\002\001\001\000\002\001\001" +
+    "\000\122\003\204\004\105\060\u054e\061\u054f\062\177\063" +
+    "\130\064\163\065\052\070\135\074\016\100\u054d\107\140" +
+    "\110\146\115\214\116\066\117\200\120\155\131\111\141" +
+    "\101\161\134\162\045\163\023\164\145\165\103\166\061" +
+    "\167\114\171\073\212\024\241\201\243\122\244\006\246" +
+    "\022\251\142\257\115\262\034\263\041\264\051\275\060" +
+    "\277\065\300\227\001\001\000\002\001\001\000\002\001" +
+    "\001\000\002\001\001\000\116\003\204\004\105\062\177" +
+    "\063\130\064\163\065\052\070\135\074\016\100\u0551\107" +
+    "\140\110\146\115\214\116\066\117\200\120\155\131\111" +
+    "\141\101\161\134\162\045\163\023\164\145\165\103\166" +
+    "\061\167\114\171\073\212\024\241\201\243\122\244\006" +
+    "\246\022\251\142\257\115\262\034\263\041\264\051\275" +
+    "\060\277\065\300\227\001\001\000\002\001\001\000\122" +
+    "\003\204\004\105\060\u0553\061\u054f\062\177\063\130\064" +
+    "\163\065\052\070\135\074\016\100\u054d\107\140\110\146" +
+    "\115\214\116\066\117\200\120\155\131\111\141\101\161" +
+    "\134\162\045\163\023\164\145\165\103\166\061\167\114" +
+    "\171\073\212\024\241\201\243\122\244\006\246\022\251" +
+    "\142\257\115\262\034\263\041\264\051\275\060\277\065" +
+    "\300\227\001\001\000\002\001\001\000\122\003\204\004" +
+    "\105\060\u0555\061\u054f\062\177\063\130\064\163\065\052" +
+    "\070\135\074\016\100\u054d\107\140\110\146\115\214\116" +
+    "\066\117\200\120\155\131\111\141\101\161\134\162\045" +
+    "\163\023\164\145\165\103\166\061\167\114\171\073\212" +
+    "\024\241\201\243\122\244\006\246\022\251\142\257\115" +
+    "\262\034\263\041\264\051\275\060\277\065\300\227\001" +
+    "\001\000\002\001\001\000\132\003\204\004\105\014\u0559" +
+    "\017\136\025\u0557\062\177\063\130\064\163\065\052\070" +
+    "\135\074\016\100\020\102\106\105\175\106\207\107\140" +
+    "\110\146\115\214\116\066\117\200\120\155\131\111\141" +
+    "\101\161\134\162\045\163\023\164\145\165\103\166\061" +
+    "\167\114\171\073\212\024\241\201\243\122\244\006\246" +
+    "\022\251\142\257\115\262\034\263\041\264\051\275\060" +
+    "\277\065\300\227\001\001\000\002\001\001\000\004\015" +
+    "\u055a\001\001\000\002\001\001\000\150\003\204\004\105" +
+    "\014\u02fb\016\u02f6\017\136\062\177\063\130\064\163\065" +
+    "\052\070\135\074\016\100\020\102\106\105\175\106\207" +
+    "\107\140\110\146\115\214\116\066\117\200\120\155\131" +
+    "\111\141\101\143\143\161\134\162\045\163\023\164\145" +
+    "\165\103\166\061\167\114\171\073\210\126\211\160\212" +
+    "\024\223\171\224\026\225\055\241\201\243\122\244\006" +
+    "\246\022\251\142\257\115\262\034\263\041\264\051\275" +
+    "\060\277\065\300\u02fa\303\u02f8\001\001\000\002\001\001" +
+    "\000\002\001\001\000\116\003\204\004\105\062\u055f\063" +
+    "\130\064\163\065\052\070\135\074\016\100\231\107\140" +
+    "\110\146\115\214\116\066\117\200\120\155\131\111\141" +
+    "\101\161\134\162\045\163\023\164\145\165\103\166\061" +
+    "\167\114\171\073\212\u055e\241\201\243\122\244\006\246" +
+    "\022\251\142\257\115\262\034\263\041\264\051\275\060" +
+    "\277\065\300\227\001\001\000\002\001\001\000\002\001" +
     "\001\000\002\001\001\000\002\001\001\000\002\001\001" +
-    "\000\002\001\001\000\010\003\u056d\010\u056f\011\u058f\001" +
-    "\001\000\002\001\001\000\010\003\u056d\010\u056f\011\u058d" +
-    "\001\001\000\004\003\u0576\001\001\000\002\001\001\000" +
-    "\006\003\u056d\010\u0575\001\001\000\002\001\001\000\002" +
-    "\001\001\000\002\001\001\000\002\001\001\000\002\001" +
-    "\001\000\002\001\001\000\012\003\u0580\005\u057f\006\u057e" +
-    "\007\u057b\001\001\000\002\001\001\000\004\003\u058a\001" +
-    "\001\000\004\003\u0587\001\001\000\004\076\u0585\001\001" +
+    "\000\002\001\001\000\002\001\001\000\004\076\u0567\001" +
+    "\001\000\010\003\331\171\u0564\301\u0569\001\001\000\002" +
+    "\001\001\000\002\001\001\000\002\001\001\000\010\046" +
+    "\u056b\047\350\056\351\001\001\000\002\001\001\000\002" +
+    "\001\001\000\002\001\001\000\002\001\001\000\010\003" +
+    "\u056e\010\u0570\011\u0590\001\001\000\002\001\001\000\010" +
+    "\003\u056e\010\u0570\011\u058e\001\001\000\004\003\u0577\001" +
+    "\001\000\002\001\001\000\006\003\u056e\010\u0576\001\001" +
     "\000\002\001\001\000\002\001\001\000\002\001\001\000" +
-    "\002\001\001\000\002\001\001\000\006\003\u0580\007\u0586" +
-    "\001\001\000\002\001\001\000\002\001\001\000\002\001" +
+    "\002\001\001\000\002\001\001\000\002\001\001\000\012" +
+    "\003\u0581\005\u0580\006\u057f\007\u057c\001\001\000\002\001" +
+    "\001\000\004\003\u058b\001\001\000\004\003\u0588\001\001" +
+    "\000\004\076\u0586\001\001\000\002\001\001\000\002\001" +
     "\001\000\002\001\001\000\002\001\001\000\002\001\001" +
-    "\000\002\001\001\000\002\001\001\000\002\001\001\000" +
+    "\000\006\003\u0581\007\u0587\001\001\000\002\001\001\000" +
     "\002\001\001\000\002\001\001\000\002\001\001\000\002" +
-    "\001\001\000\002\001\001\000\002\001\001\000\012\003" +
-    "\u0580\005\u0595\006\u057e\007\u057b\001\001\000\002\001\001" +
+    "\001\001\000\002\001\001\000\002\001\001\000\002\001" +
+    "\001\000\002\001\001\000\002\001\001\000\002\001\001" +
     "\000\002\001\001\000\002\001\001\000\002\001\001\000" +
-    "\126\003\204\004\105\062\177\063\130\064\163\065\052" +
-    "\070\135\074\016\100\u0351\107\140\110\146\115\214\116" +
-    "\066\117\200\120\155\131\111\132\u059a\133\u0352\134\u0354" +
-    "\135\u0353\141\101\161\134\162\045\163\023\164\145\165" +
-    "\103\166\061\167\114\171\073\212\024\241\201\243\122" +
-    "\244\006\246\022\251\142\257\115\262\034\263\041\264" +
-    "\051\275\060\277\065\300\227\001\001\000\002\001\001" +
-    "\000\002\001\001\000\116\003\204\004\105\062\177\063" +
-    "\130\064\163\065\052\070\135\074\016\100\u059d\107\140" +
-    "\110\146\115\214\116\066\117\200\120\155\131\111\141" +
+    "\002\001\001\000\012\003\u0581\005\u0596\006\u057f\007\u057c" +
+    "\001\001\000\002\001\001\000\002\001\001\000\002\001" +
+    "\001\000\002\001\001\000\126\003\204\004\105\062\177" +
+    "\063\130\064\163\065\052\070\135\074\016\100\u0352\107" +
+    "\140\110\146\115\214\116\066\117\200\120\155\131\111" +
+    "\132\u059b\133\u0353\134\u0355\135\u0354\141\101\161\134\162" +
+    "\045\163\023\164\145\165\103\166\061\167\114\171\073" +
+    "\212\024\241\201\243\122\244\006\246\022\251\142\257" +
+    "\115\262\034\263\041\264\051\275\060\277\065\300\227" +
+    "\001\001\000\002\001\001\000\002\001\001\000\116\003" +
+    "\204\004\105\062\177\063\130\064\163\065\052\070\135" +
+    "\074\016\100\u059e\107\140\110\146\115\214\116\066\117" +
+    "\200\120\155\131\111\141\101\161\134\162\045\163\023" +
+    "\164\145\165\103\166\061\167\114\171\073\212\024\241" +
+    "\201\243\122\244\006\246\022\251\142\257\115\262\034" +
+    "\263\041\264\051\275\060\277\065\300\227\001\001\000" +
+    "\002\001\001\000\002\001\001\000\130\003\204\004\105" +
+    "\062\177\063\130\064\163\065\052\070\135\074\016\100" +
+    "\u05a1\101\u05a7\107\140\110\146\111\u05a3\112\u05a5\113\u05a8" +
+    "\114\u05a2\115\214\116\066\117\200\120\155\131\111\141" +
     "\101\161\134\162\045\163\023\164\145\165\103\166\061" +
     "\167\114\171\073\212\024\241\201\243\122\244\006\246" +
     "\022\251\142\257\115\262\034\263\041\264\051\275\060" +
-    "\277\065\300\227\001\001\000\002\001\001\000\002\001" +
-    "\001\000\130\003\204\004\105\062\177\063\130\064\163" +
-    "\065\052\070\135\074\016\100\u05a0\101\u05a6\107\140\110" +
-    "\146\111\u05a2\112\u05a4\113\u05a7\114\u05a1\115\214\116\066" +
+    "\277\065\300\227\001\001\000\002\001\001\000\004\076" +
+    "\u05b2\001\001\000\002\001\001\000\004\076\u05ad\001\001" +
+    "\000\004\076\u05aa\001\001\000\002\001\001\000\002\001" +
+    "\001\000\002\001\001\000\124\003\204\004\105\062\177" +
+    "\063\130\064\163\065\052\070\135\074\016\100\u05a1\101" +
+    "\u05a7\107\140\110\146\113\u05ab\114\u05a2\115\214\116\066" +
     "\117\200\120\155\131\111\141\101\161\134\162\045\163" +
     "\023\164\145\165\103\166\061\167\114\171\073\212\024" +
     "\241\201\243\122\244\006\246\022\251\142\257\115\262" +
     "\034\263\041\264\051\275\060\277\065\300\227\001\001" +
-    "\000\002\001\001\000\004\076\u05b1\001\001\000\002\001" +
-    "\001\000\004\076\u05ac\001\001\000\004\076\u05a9\001\001" +
     "\000\002\001\001\000\002\001\001\000\002\001\001\000" +
-    "\124\003\204\004\105\062\177\063\130\064\163\065\052" +
-    "\070\135\074\016\100\u05a0\101\u05a6\107\140\110\146\113" +
-    "\u05aa\114\u05a1\115\214\116\066\117\200\120\155\131\111" +
+    "\002\001\001\000\120\003\204\004\105\062\177\063\130" +
+    "\064\163\065\052\070\135\074\016\100\u05a1\101\u05af\107" +
+    "\140\110\146\115\214\116\066\117\200\120\155\131\111" +
     "\141\101\161\134\162\045\163\023\164\145\165\103\166" +
     "\061\167\114\171\073\212\024\241\201\243\122\244\006" +
     "\246\022\251\142\257\115\262\034\263\041\264\051\275" +
     "\060\277\065\300\227\001\001\000\002\001\001\000\002" +
-    "\001\001\000\002\001\001\000\002\001\001\000\120\003" +
+    "\001\001\000\120\003\204\004\105\062\177\063\130\064" +
+    "\163\065\052\070\135\074\016\100\u05a1\101\u05b5\107\140" +
+    "\110\146\115\214\116\066\117\200\120\155\131\111\141" +
+    "\101\161\134\162\045\163\023\164\145\165\103\166\061" +
+    "\167\114\171\073\212\024\241\201\243\122\244\006\246" +
+    "\022\251\142\257\115\262\034\263\041\264\051\275\060" +
+    "\277\065\300\227\001\001\000\002\001\001\000\120\003" +
     "\204\004\105\062\177\063\130\064\163\065\052\070\135" +
-    "\074\016\100\u05a0\101\u05ae\107\140\110\146\115\214\116" +
+    "\074\016\100\u05a1\101\u05b4\107\140\110\146\115\214\116" +
     "\066\117\200\120\155\131\111\141\101\161\134\162\045" +
     "\163\023\164\145\165\103\166\061\167\114\171\073\212" +
     "\024\241\201\243\122\244\006\246\022\251\142\257\115" +
     "\262\034\263\041\264\051\275\060\277\065\300\227\001" +
-    "\001\000\002\001\001\000\002\001\001\000\120\003\204" +
-    "\004\105\062\177\063\130\064\163\065\052\070\135\074" +
-    "\016\100\u05a0\101\u05b4\107\140\110\146\115\214\116\066" +
-    "\117\200\120\155\131\111\141\101\161\134\162\045\163" +
-    "\023\164\145\165\103\166\061\167\114\171\073\212\024" +
-    "\241\201\243\122\244\006\246\022\251\142\257\115\262" +
-    "\034\263\041\264\051\275\060\277\065\300\227\001\001" +
-    "\000\002\001\001\000\120\003\204\004\105\062\177\063" +
-    "\130\064\163\065\052\070\135\074\016\100\u05a0\101\u05b3" +
-    "\107\140\110\146\115\214\116\066\117\200\120\155\131" +
-    "\111\141\101\161\134\162\045\163\023\164\145\165\103" +
-    "\166\061\167\114\171\073\212\024\241\201\243\122\244" +
-    "\006\246\022\251\142\257\115\262\034\263\041\264\051" +
-    "\275\060\277\065\300\227\001\001\000\002\001\001\000" +
-    "\002\001\001\000\002\001\001\000\002\001\001\000\002" +
+    "\001\000\002\001\001\000\002\001\001\000\002\001\001" +
+    "\000\002\001\001\000\002\001\001\000\116\003\204\004" +
+    "\105\062\177\063\130\064\163\065\052\070\135\074\016" +
+    "\100\u05ba\107\140\110\146\115\214\116\066\117\200\120" +
+    "\155\131\111\141\101\161\134\162\045\163\023\164\145" +
+    "\165\103\166\061\167\114\171\073\212\024\241\201\243" +
+    "\122\244\006\246\022\251\142\257\115\262\034\263\041" +
+    "\264\051\275\060\277\065\300\227\001\001\000\002\001" +
+    "\001\000\002\001\001\000\002\001\001\000\054\003\u0113" +
+    "\064\163\065\052\115\u0110\116\066\117\u010a\120\155\131" +
+    "\111\162\045\165\u010b\166\061\171\u010d\212\u05c0\241\u05bf" +
+    "\244\006\246\022\251\142\262\034\263\041\264\051\275" +
+    "\060\001\001\000\002\001\001\000\002\001\001\000\002" +
     "\001\001\000\116\003\204\004\105\062\177\063\130\064" +
-    "\163\065\052\070\135\074\016\100\u05b9\107\140\110\146" +
+    "\163\065\052\070\135\074\016\100\u05c2\107\140\110\146" +
     "\115\214\116\066\117\200\120\155\131\111\141\101\161" +
     "\134\162\045\163\023\164\145\165\103\166\061\167\114" +
     "\171\073\212\024\241\201\243\122\244\006\246\022\251" +
     "\142\257\115\262\034\263\041\264\051\275\060\277\065" +
     "\300\227\001\001\000\002\001\001\000\002\001\001\000" +
-    "\002\001\001\000\054\003\u0113\064\163\065\052\115\u0110" +
-    "\116\066\117\u010a\120\155\131\111\162\045\165\u010b\166" +
-    "\061\171\u010d\212\u05bf\241\u05be\244\006\246\022\251\142" +
-    "\262\034\263\041\264\051\275\060\001\001\000\002\001" +
-    "\001\000\002\001\001\000\002\001\001\000\116\003\204" +
-    "\004\105\062\177\063\130\064\163\065\052\070\135\074" +
-    "\016\100\u05c1\107\140\110\146\115\214\116\066\117\200" +
-    "\120\155\131\111\141\101\161\134\162\045\163\023\164" +
-    "\145\165\103\166\061\167\114\171\073\212\024\241\201" +
-    "\243\122\244\006\246\022\251\142\257\115\262\034\263" +
-    "\041\264\051\275\060\277\065\300\227\001\001\000\002" +
-    "\001\001\000\002\001\001\000\004\051\u05c5\001\001\000" +
-    "\002\001\001\000\002\001\001\000\010\046\u05c7\047\350" +
-    "\056\351\001\001\000\002\001\001\000\002\001\001\000" +
-    "\002\001\001" });
+    "\004\051\u05c6\001\001\000\002\001\001\000\002\001\001" +
+    "\000\010\046\u05c8\047\350\056\351\001\001\000\002\001" +
+    "\001\000\002\001\001\000\002\001\001" });
 
   /** Access to <code>reduce_goto</code> table. */
   public short[][] reduce_table() {return _reduce_table;}
@@ -10656,22 +10656,22 @@ switch (CUP$ASTPHP5Parser$act_num) {
           return CUP$ASTPHP5Parser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 468: // lexical_vars ::= T_USE T_OPEN_PARENTHESE lexical_var_list T_CLOSE_PARENTHESE
+          case 468: // lexical_vars ::= T_USE T_OPEN_PARENTHESE lexical_var_list possible_comma T_CLOSE_PARENTHESE
             {
               List RESULT =null;
-		int sleft = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-3)).left;
-		int sright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-3)).right;
-		String s = (String)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-3)).value;
-		int listleft = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-1)).left;
-		int listright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-1)).right;
-		List list = (List)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-1)).value;
+		int sleft = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-4)).left;
+		int sright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-4)).right;
+		String s = (String)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-4)).value;
+		int listleft = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-2)).left;
+		int listright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-2)).right;
+		List list = (List)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-2)).value;
 		int eleft = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).left;
 		int eright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
 		Object e = (Object)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
 
     RESULT = list;
 
-              CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("lexical_vars",32, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-3)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
+              CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("lexical_vars",32, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-4)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
             }
           return CUP$ASTPHP5Parser$result;
 
diff --git a/php/php.editor/src/org/netbeans/modules/php/editor/parser/ASTPHP5Symbols.java b/php/php.editor/src/org/netbeans/modules/php/editor/parser/ASTPHP5Symbols.java
index c5b9de5..6ab5fe1 100644
--- a/php/php.editor/src/org/netbeans/modules/php/editor/parser/ASTPHP5Symbols.java
+++ b/php/php.editor/src/org/netbeans/modules/php/editor/parser/ASTPHP5Symbols.java
@@ -19,7 +19,7 @@
 
 //----------------------------------------------------
 // The following code was generated by CUP v0.11a beta 20060608
-// Fri Jan 08 07:38:57 JST 2021
+// Mon Jan 18 23:35:12 JST 2021
 //----------------------------------------------------
 
 package org.netbeans.modules.php.editor.parser;
diff --git a/php/php.editor/src/org/netbeans/modules/php/editor/parser/EncodedActionTable1.java b/php/php.editor/src/org/netbeans/modules/php/editor/parser/EncodedActionTable1.java
index 5d071a0..9506123 100644
--- a/php/php.editor/src/org/netbeans/modules/php/editor/parser/EncodedActionTable1.java
+++ b/php/php.editor/src/org/netbeans/modules/php/editor/parser/EncodedActionTable1.java
@@ -28,7 +28,7 @@ public class EncodedActionTable1 {
     }
     protected EncodedActionTable1() {
         sb = new StringBuilder();
-        sb.append("\000\u05c8\000\264\002\uffa8\003\uffa8\004\uffa8\005\uffa8\006");
+        sb.append("\000\u05c9\000\264\002\uffa8\003\uffa8\004\uffa8\005\uffa8\006");
         sb.append("\uffa8\007\uffa8\010\uffa8\011\uffa8\012\uffa8\014\uffa8\015\uffa8");
         sb.append("\016\uffa8\017\uffa8\020\uffa8\021\uffa8\023\uffa8\025\uffa8\027");
         sb.append("\uffa8\032\uffa8\034\uffa8\036\uffa8\041\uffa8\042\uffa8\043\uffa8");
@@ -42,7 +42,7 @@ public class EncodedActionTable1 {
         sb.append("\uffa8\205\uffa8\206\uffa8\207\uffa8\210\uffa8\211\uffa8\212\uffa8");
         sb.append("\213\uffa8\214\uffa8\216\uffa8\222\uffa8\223\uffa8\224\uffa8\230");
         sb.append("\uffa8\233\uffa8\234\uffa8\235\uffa8\236\uffa8\240\uffa8\247\uffa8");
-        sb.append("\001\002\000\004\002\u05ca\001\002\000\264\002\001\003");
+        sb.append("\001\002\000\004\002\u05cb\001\002\000\264\002\001\003");
         sb.append("\151\004\204\005\221\006\133\007\012\010\040\011\065");
         sb.append("\012\075\014\117\015\170\016\166\017\160\020\155\021");
         sb.append("\054\023\037\025\125\027\220\032\126\034\167\036\014");
@@ -62,7 +62,7 @@ public class EncodedActionTable1 {
         sb.append("\ufdfb\157\ufdfb\160\ufdfb\161\ufdfb\162\ufdfb\163\ufdfb\164\ufdfb");
         sb.append("\165\ufdfb\166\ufdfb\167\ufdfb\170\ufdfb\171\ufdfb\172\ufdfb\173");
         sb.append("\ufdfb\174\ufdfb\175\ufdfb\176\ufdfb\201\ufdfb\215\ufdfb\231\ufdfb");
-        sb.append("\232\ufdfb\242\ufdfb\245\ufdfb\001\002\000\004\230\u05c7\001");
+        sb.append("\232\ufdfb\242\ufdfb\245\ufdfb\001\002\000\004\230\u05c8\001");
         sb.append("\002\000\312\002\uff61\003\uff61\004\uff61\005\uff61\006\uff61");
         sb.append("\007\uff61\010\uff61\011\uff61\012\uff61\014\uff61\015\uff61\016");
         sb.append("\uff61\017\uff61\020\uff61\021\uff61\022\uff61\023\uff61\024\uff61");
@@ -79,7 +79,7 @@ public class EncodedActionTable1 {
         sb.append("\212\uff61\213\uff61\214\uff61\216\uff61\217\uff61\220\uff61\221");
         sb.append("\uff61\222\uff61\223\uff61\224\uff61\230\uff61\233\uff61\234\uff61");
         sb.append("\235\uff61\236\uff61\240\uff61\247\uff61\001\002\000\006\012");
-        sb.append("\u05bc\233\u05bd\001\002\000\114\031\ufdfe\033\ufdfe\073\ufdfe");
+        sb.append("\u05bd\233\u05be\001\002\000\114\031\ufdfe\033\ufdfe\073\ufdfe");
         sb.append("\112\ufdfe\127\ufdfe\130\ufdfe\131\ufdfe\132\ufdfe\150\ufdfe\151");
         sb.append("\ufdfe\152\ufdfe\153\ufdfe\154\ufdfe\155\ufdfe\156\ufdfe\157\ufdfe");
         sb.append("\160\ufdfe\161\ufdfe\162\ufdfe\163\ufdfe\164\ufdfe\165\ufdfe\166");
@@ -100,8 +100,8 @@ public class EncodedActionTable1 {
         sb.append("\173\206\044\207\163\210\114\211\174\212\110\213\043");
         sb.append("\214\063\215\ufda3\216\120\222\225\230\212\231\ufda3\232");
         sb.append("\ufda3\233\124\234\140\235\073\236\152\242\ufda3\245\ufda3");
-        sb.append("\247\032\001\002\000\004\230\u059d\001\002\000\004\230");
-        sb.append("\u059a\001\002\000\166\004\204\006\133\007\012\010\224");
+        sb.append("\247\032\001\002\000\004\230\u059e\001\002\000\004\230");
+        sb.append("\u059b\001\002\000\166\004\204\006\133\007\012\010\224");
         sb.append("\011\065\012\075\015\170\016\166\032\126\036\014\044");
         sb.append("\077\045\227\054\216\062\207\063\034\074\213\075\015");
         sb.append("\077\022\100\150\101\055\102\057\103\171\104\006\105");
@@ -116,7 +116,7 @@ public class EncodedActionTable1 {
         sb.append("\ufe44\160\ufe44\161\ufe44\162\ufe44\163\ufe44\164\ufe44\165\ufe44");
         sb.append("\166\ufe44\167\ufe44\170\ufe44\171\ufe44\172\ufe44\173\ufe44\174");
         sb.append("\ufe44\175\ufe44\176\ufe44\201\ufe44\215\ufe44\231\ufe44\232\ufe44");
-        sb.append("\242\ufe44\245\ufe44\001\002\000\004\065\u0598\001\002\000");
+        sb.append("\242\ufe44\245\ufe44\001\002\000\004\065\u0599\001\002\000");
         sb.append("\114\031\270\033\ufd95\073\ufd95\112\ufd95\127\ufd95\130\257");
         sb.append("\131\300\132\246\150\252\151\ufd95\152\247\153\271\154");
         sb.append("\250\155\261\156\272\157\276\160\263\161\243\162\260");
@@ -184,8 +184,8 @@ public class EncodedActionTable1 {
         sb.append("\uff48\212\uff48\213\uff48\214\uff48\216\uff48\217\uff48\220\uff48");
         sb.append("\221\uff48\222\uff48\223\uff48\224\uff48\230\uff48\233\uff48\234");
         sb.append("\uff48\235\uff48\236\uff48\240\uff48\247\uff48\001\002\000\020");
-        sb.append("\010\325\016\u0321\045\u056f\046\u0571\117\u0572\121\070\230");
-        sb.append("\u0320\001\002\000\166\004\204\006\133\007\012\010\224");
+        sb.append("\010\325\016\u0322\045\u0570\046\u0572\117\u0573\121\070\230");
+        sb.append("\u0321\001\002\000\166\004\204\006\133\007\012\010\224");
         sb.append("\011\065\012\075\015\170\016\166\032\126\036\014\044");
         sb.append("\077\045\227\054\216\062\207\063\034\074\213\075\015");
         sb.append("\077\022\100\150\101\055\102\057\103\171\104\006\105");
@@ -205,7 +205,7 @@ public class EncodedActionTable1 {
         sb.append("\204\031\205\173\206\044\207\163\210\114\211\174\212");
         sb.append("\110\213\043\214\063\216\120\222\225\230\231\233\124");
         sb.append("\234\140\235\073\236\152\247\032\001\002\000\004\230");
-        sb.append("\u055d\001\002\000\170\031\ufd5d\033\ufd5d\071\ufd5d\072\ufd5d");
+        sb.append("\u055e\001\002\000\170\031\ufd5d\033\ufd5d\071\ufd5d\072\ufd5d");
         sb.append("\073\ufd5d\111\u011d\112\ufd5d\113\ufd5d\127\ufd5d\130\ufd5d\131");
         sb.append("\ufd5d\132\ufd5d\134\ufd5d\135\ufd5d\136\ufd5d\137\ufd5d\140\ufd5d");
         sb.append("\141\ufd5d\142\ufd5d\143\ufd5d\144\ufd5d\145\ufd5d\146\ufd5d\147");
@@ -215,12 +215,12 @@ public class EncodedActionTable1 {
         sb.append("\173\ufd5d\174\ufd5d\175\ufd5d\176\ufd5d\201\ufd5d\202\ufd5d\203");
         sb.append("\ufd5d\214\u011f\215\ufd5d\230\ufe1a\231\ufd5d\232\ufd5d\242\ufd5d");
         sb.append("\243\ufd5d\245\ufd5d\246\ufd5d\001\002\000\004\010\uff32\001");
-        sb.append("\002\000\004\230\u054c\001\002\000\112\031\uffff\111\u011d");
+        sb.append("\002\000\004\230\u054d\001\002\000\112\031\uffff\111\u011d");
         sb.append("\113\uffff\117\uffff\130\uffff\131\uffff\132\uffff\150\uffff\151");
         sb.append("\uffff\152\uffff\153\uffff\154\uffff\155\uffff\156\uffff\157\uffff");
         sb.append("\160\uffff\161\uffff\162\uffff\163\uffff\164\uffff\165\uffff\166");
         sb.append("\uffff\167\uffff\170\uffff\171\uffff\172\uffff\173\uffff\174\uffff");
-        sb.append("\175\uffff\176\uffff\201\uffff\214\u011f\230\uffff\232\u054b\242");
+        sb.append("\175\uffff\176\uffff\201\uffff\214\u011f\230\uffff\232\u054c\242");
         sb.append("\uffff\245\uffff\001\002\000\014\012\ufd3b\015\ufd3b\106\ufd3b");
         sb.append("\107\ufd3b\110\ufd3b\001\002\000\160\031\ufd71\033\ufd71\071");
         sb.append("\ufd71\072\ufd71\073\ufd71\112\ufd71\127\ufd71\130\ufd71\131\ufd71");
@@ -264,7 +264,7 @@ public class EncodedActionTable1 {
         sb.append("\ufd86\166\ufd86\167\ufd86\170\ufd86\171\ufd86\172\ufd86\173\ufd86");
         sb.append("\174\ufd86\175\ufd86\176\ufd86\201\ufd86\202\ufd86\203\ufd86\215");
         sb.append("\ufd86\230\ufe19\231\ufd86\232\ufd86\242\ufd86\243\ufd86\245\ufd86");
-        sb.append("\246\ufd86\001\002\000\004\111\u051f\001\002\000\166\004");
+        sb.append("\246\ufd86\001\002\000\004\111\u0520\001\002\000\166\004");
         sb.append("\204\006\133\007\012\010\224\011\065\012\075\015\170");
         sb.append("\016\166\032\126\036\014\044\077\045\227\054\216\062");
         sb.append("\207\063\034\074\213\075\015\077\022\100\150\101\055");
@@ -274,9 +274,9 @@ public class EncodedActionTable1 {
         sb.append("\064\203\214\204\031\205\173\206\044\207\163\210\114");
         sb.append("\211\174\212\110\213\043\214\063\216\120\222\225\230");
         sb.append("\231\233\124\234\140\235\073\236\152\247\032\001\002");
-        sb.append("\000\012\012\u0515\044\u0300\045\u0301\113\ufe14\001\002\000");
+        sb.append("\000\012\012\u0516\044\u0300\045\u0301\113\ufe14\001\002\000");
         sb.append("\162\031\ufd64\033\ufd64\071\ufd64\072\ufd64\073\ufd64\112\ufd64");
-        sb.append("\113\u0510\127\ufd64\130\ufd64\131\ufd64\132\ufd64\134\ufd64\135");
+        sb.append("\113\u0511\127\ufd64\130\ufd64\131\ufd64\132\ufd64\134\ufd64\135");
         sb.append("\ufd64\136\ufd64\137\ufd64\140\ufd64\141\ufd64\142\ufd64\143\ufd64");
         sb.append("\144\ufd64\145\ufd64\146\ufd64\147\ufd64\150\ufd64\151\ufd64\152");
         sb.append("\ufd64\153\ufd64\154\ufd64\155\ufd64\156\ufd64\157\ufd64\160\ufd64");
@@ -285,29 +285,29 @@ public class EncodedActionTable1 {
         sb.append("\176\ufd64\201\ufd64\202\ufd64\203\ufd64\215\ufd64\231\ufd64\232");
         sb.append("\ufd64\242\ufd64\243\ufd64\245\ufd64\246\ufd64\001\002\000\170");
         sb.append("\031\ufd70\033\ufd70\071\ufd70\072\ufd70\073\ufd70\111\u011d\112");
-        sb.append("\ufd70\113\u0508\127\ufd70\130\ufd70\131\ufd70\132\ufd70\134\ufd70");
+        sb.append("\ufd70\113\u0509\127\ufd70\130\ufd70\131\ufd70\132\ufd70\134\ufd70");
         sb.append("\135\ufd70\136\ufd70\137\ufd70\140\ufd70\141\ufd70\142\ufd70\143");
         sb.append("\ufd70\144\ufd70\145\ufd70\146\ufd70\147\ufd70\150\ufd70\151\ufd70");
         sb.append("\152\ufd70\153\ufd70\154\ufd70\155\ufd70\156\ufd70\157\ufd70\160");
         sb.append("\ufd70\161\ufd70\162\ufd70\163\ufd70\164\ufd70\165\ufd70\166\ufd70");
         sb.append("\167\ufd70\170\ufd70\171\ufd70\172\ufd70\173\ufd70\174\ufd70\175");
         sb.append("\ufd70\176\ufd70\201\ufd70\202\ufd70\203\ufd70\214\u011f\215\ufd70");
-        sb.append("\230\u0507\231\ufd70\232\ufd70\242\ufd70\243\ufd70\245\ufd70\246");
-        sb.append("\ufd70\001\002\000\004\230\u04fe\001\002\000\114\031\ufdf7");
+        sb.append("\230\u0508\231\ufd70\232\ufd70\242\ufd70\243\ufd70\245\ufd70\246");
+        sb.append("\ufd70\001\002\000\004\230\u04ff\001\002\000\114\031\ufdf7");
         sb.append("\033\ufdf7\073\ufdf7\112\ufdf7\127\ufdf7\130\ufdf7\131\ufdf7\132");
         sb.append("\ufdf7\150\ufdf7\151\ufdf7\152\ufdf7\153\ufdf7\154\ufdf7\155\ufdf7");
         sb.append("\156\ufdf7\157\ufdf7\160\ufdf7\161\ufdf7\162\ufdf7\163\ufdf7\164");
         sb.append("\ufdf7\165\ufdf7\166\ufdf7\167\ufdf7\170\ufdf7\171\ufdf7\172\ufdf7");
         sb.append("\173\ufdf7\174\ufdf7\175\ufdf7\176\ufdf7\201\ufdf7\215\ufdf7\231");
-        sb.append("\ufdf7\232\ufdf7\242\ufdf7\245\ufdf7\001\002\000\004\010\u04f8");
+        sb.append("\ufdf7\232\ufdf7\242\ufdf7\245\ufdf7\001\002\000\004\010\u04f9");
         sb.append("\001\002\000\114\031\ufdf6\033\ufdf6\073\ufdf6\112\ufdf6\127");
         sb.append("\ufdf6\130\ufdf6\131\ufdf6\132\ufdf6\150\ufdf6\151\ufdf6\152\ufdf6");
         sb.append("\153\ufdf6\154\ufdf6\155\ufdf6\156\ufdf6\157\ufdf6\160\ufdf6\161");
         sb.append("\ufdf6\162\ufdf6\163\ufdf6\164\ufdf6\165\ufdf6\166\ufdf6\167\ufdf6");
         sb.append("\170\ufdf6\171\ufdf6\172\ufdf6\173\ufdf6\174\ufdf6\175\ufdf6\176");
         sb.append("\ufdf6\201\ufdf6\215\ufdf6\231\ufdf6\232\ufdf6\242\ufdf6\245\ufdf6");
-        sb.append("\001\002\000\004\230\u04f5\001\002\000\160\031\ufd85\033");
-        sb.append("\ufd85\071\u04ec\072\u04eb\073\ufd85\112\ufd85\127\ufd85\130\ufd85");
+        sb.append("\001\002\000\004\230\u04f6\001\002\000\160\031\ufd85\033");
+        sb.append("\ufd85\071\u04ed\072\u04ec\073\ufd85\112\ufd85\127\ufd85\130\ufd85");
         sb.append("\131\ufd85\132\ufd85\134\ufd85\135\ufd85\136\ufd85\137\ufd85\140");
         sb.append("\ufd85\141\ufd85\142\ufd85\143\ufd85\144\ufd85\145\ufd85\146\ufd85");
         sb.append("\147\ufd85\150\ufd85\151\ufd85\152\ufd85\153\ufd85\154\ufd85\155");
@@ -327,14 +327,14 @@ public class EncodedActionTable1 {
         sb.append("\242\ufd5e\243\ufd5e\245\ufd5e\246\ufd5e\001\002\000\176\004");
         sb.append("\204\006\133\007\012\010\224\011\065\012\075\015\170");
         sb.append("\016\166\032\126\036\014\044\077\045\227\054\216\062");
-        sb.append("\207\063\034\074\u0358\075\015\077\022\100\150\101\055");
+        sb.append("\207\063\034\074\u0359\075\015\077\022\100\150\101\055");
         sb.append("\102\057\103\171\104\006\105\041\114\226\115\165\116");
         sb.append("\045\117\103\121\070\122\033\123\111\124\060\125\162");
-        sb.append("\126\132\127\ufd46\133\100\156\u0351\172\130\173\105\177");
+        sb.append("\126\132\127\ufd46\133\100\156\u0352\172\130\173\105\177");
         sb.append("\206\200\016\202\064\203\214\204\031\205\173\206\044");
         sb.append("\207\163\210\114\211\174\212\110\213\043\214\063\215");
         sb.append("\ufd46\216\120\222\225\230\231\233\124\234\140\235\073");
-        sb.append("\236\152\244\u0357\247\032\001\002\000\030\010\325\012");
+        sb.append("\236\152\244\u0358\247\032\001\002\000\030\010\325\012");
         sb.append("\075\016\u0112\075\015\114\u0113\117\u010d\121\070\214\320");
         sb.append("\222\322\230\231\233\124\001\002\000\114\031\ufdb7\033");
         sb.append("\ufdb7\073\ufdb7\112\ufdb7\127\ufdb7\130\ufdb7\131\ufdb7\132\ufdb7");
@@ -368,7 +368,7 @@ public class EncodedActionTable1 {
         sb.append("\077\045\227\054\216\062\207\063\034\074\213\075\015");
         sb.append("\077\022\100\150\101\055\102\057\103\171\104\006\105");
         sb.append("\041\114\226\115\165\116\045\117\103\121\070\122\033");
-        sb.append("\123\111\124\060\125\162\126\132\133\100\151\u04e2\172");
+        sb.append("\123\111\124\060\125\162\126\132\133\100\151\u04e3\172");
         sb.append("\130\173\105\177\206\200\016\202\064\203\214\204\031");
         sb.append("\205\173\206\044\207\163\210\114\211\174\212\110\213");
         sb.append("\043\214\063\216\120\222\225\230\231\233\124\234\140");
@@ -388,7 +388,7 @@ public class EncodedActionTable1 {
         sb.append("\uffa2\222\uffa2\223\uffa2\224\uffa2\230\uffa2\233\uffa2\234\uffa2");
         sb.append("\235\uffa2\236\uffa2\240\uffa2\247\uffa2\001\002\000\014\012");
         sb.append("\ufd3b\015\ufd3b\107\ufd3b\110\ufd3b\235\ufd3b\001\002\000\004");
-        sb.append("\113\u04dd\001\002\000\206\012\ufd1e\015\ufd1e\031\ufd1e\033");
+        sb.append("\113\u04de\001\002\000\206\012\ufd1e\015\ufd1e\031\ufd1e\033");
         sb.append("\ufd1e\071\ufd1e\072\ufd1e\073\ufd1e\106\ufd1e\107\ufd1e\110\ufd1e");
         sb.append("\111\ufd1e\112\ufd1e\113\ufd1e\127\ufd1e\130\ufd1e\131\ufd1e\132");
         sb.append("\ufd1e\134\ufd1e\135\ufd1e\136\ufd1e\137\ufd1e\140\ufd1e\141\ufd1e");
@@ -399,7 +399,7 @@ public class EncodedActionTable1 {
         sb.append("\174\ufd1e\175\ufd1e\176\ufd1e\201\ufd1e\202\ufd1e\203\ufd1e\214");
         sb.append("\ufd1e\215\ufd1e\230\ufd1e\231\ufd1e\232\ufd1e\234\ufd1e\235\ufd1e");
         sb.append("\242\ufd1e\243\ufd1e\245\ufd1e\246\ufd1e\001\002\000\004\065");
-        sb.append("\u04dc\001\002\000\006\156\u02e4\230\uff47\001\002\000\166");
+        sb.append("\u04dd\001\002\000\006\156\u02e4\230\uff47\001\002\000\166");
         sb.append("\004\204\006\133\007\012\010\224\011\065\012\075\015");
         sb.append("\170\016\166\032\126\036\014\044\077\045\227\054\216");
         sb.append("\062\207\063\034\074\213\075\015\077\022\100\150\101");
@@ -445,7 +445,7 @@ public class EncodedActionTable1 {
         sb.append("\202\064\203\214\204\031\205\173\206\044\207\163\210");
         sb.append("\114\211\174\212\110\213\043\214\063\216\120\222\225");
         sb.append("\230\231\233\124\234\140\235\073\236\152\247\032\001");
-        sb.append("\002\000\006\111\u011d\214\u011f\001\002\000\004\151\u04ce");
+        sb.append("\002\000\006\111\u011d\214\u011f\001\002\000\004\151\u04cf");
         sb.append("\001\002\000\166\004\204\006\133\007\012\010\224\011");
         sb.append("\065\012\075\015\170\016\166\032\126\036\014\044\077");
         sb.append("\045\227\054\216\062\207\063\034\074\213\075\015\077");
@@ -465,7 +465,7 @@ public class EncodedActionTable1 {
         sb.append("\205\173\206\044\207\163\210\114\211\174\212\110\213");
         sb.append("\043\214\063\216\120\222\225\230\231\233\124\234\140");
         sb.append("\235\073\236\152\247\032\001\002\000\006\012\075\233");
-        sb.append("\u0131\001\002\000\004\010\u04c9\001\002\000\166\004\204");
+        sb.append("\u0131\001\002\000\004\010\u04ca\001\002\000\166\004\204");
         sb.append("\006\133\007\012\010\224\011\065\012\075\015\170\016");
         sb.append("\166\032\126\036\014\044\077\045\227\054\216\062\207");
         sb.append("\063\034\074\213\075\015\077\022\100\150\101\055\102");
@@ -505,9 +505,9 @@ public class EncodedActionTable1 {
         sb.append("\236\uff68\240\uff68\247\uff68\001\002\000\032\010\325\012");
         sb.append("\075\065\342\075\015\114\331\117\316\121\070\214\320");
         sb.append("\222\322\230\330\233\124\247\032\001\002\000\004\230");
-        sb.append("\u04bd\001\002\000\012\010\325\111\u04b5\117\u0396\121\070");
-        sb.append("\001\002\000\006\202\u04b3\203\u04b4\001\002\000\010\012");
-        sb.append("\ufd4b\111\u0132\233\ufd4b\001\002\000\004\230\u0495\001\002");
+        sb.append("\u04be\001\002\000\012\010\325\111\u04b6\117\u0397\121\070");
+        sb.append("\001\002\000\006\202\u04b4\203\u04b5\001\002\000\010\012");
+        sb.append("\ufd4b\111\u0132\233\ufd4b\001\002\000\004\230\u0496\001\002");
         sb.append("\000\166\004\204\006\133\007\012\010\224\011\065\012");
         sb.append("\075\015\170\016\166\032\126\036\014\044\077\045\227");
         sb.append("\054\216\062\207\063\034\074\213\075\015\077\022\100");
@@ -622,8 +622,8 @@ public class EncodedActionTable1 {
         sb.append("\ufd57\165\ufd57\166\ufd57\167\ufd57\170\ufd57\171\ufd57\172\ufd57");
         sb.append("\173\ufd57\174\ufd57\175\ufd57\176\ufd57\201\ufd57\202\ufd57\203");
         sb.append("\ufd57\214\ufd57\215\ufd57\230\ufd57\231\ufd57\232\ufd57\242\ufd57");
-        sb.append("\243\ufd57\245\ufd57\246\ufd57\001\002\000\004\010\u0456\001");
-        sb.append("\002\000\006\127\u0451\151\u0452\001\002\000\120\031\ufd6f");
+        sb.append("\243\ufd57\245\ufd57\246\ufd57\001\002\000\004\010\u0457\001");
+        sb.append("\002\000\006\127\u0452\151\u0453\001\002\000\120\031\ufd6f");
         sb.append("\033\ufd6f\073\ufd6f\111\u011d\112\ufd6f\127\ufd6f\130\ufd6f\131");
         sb.append("\ufd6f\132\ufd6f\150\ufd6f\151\ufd6f\152\ufd6f\153\ufd6f\154\ufd6f");
         sb.append("\155\ufd6f\156\ufd6f\157\ufd6f\160\ufd6f\161\ufd6f\162\ufd6f\163");
@@ -657,10 +657,10 @@ public class EncodedActionTable1 {
         sb.append("\204\uff5d\205\uff5d\206\uff5d\207\uff5d\210\uff5d\211\uff5d\212");
         sb.append("\uff5d\213\uff5d\214\uff5d\216\uff5d\217\uff5d\220\uff5d\221\uff5d");
         sb.append("\222\uff5d\223\uff5d\224\uff5d\230\uff5d\233\uff5d\234\uff5d\235");
-        sb.append("\uff5d\236\uff5d\240\uff5d\247\uff5d\001\002\000\006\015\u044f");
-        sb.append("\237\u044e\001\002\000\024\044\077\045\134\065\036\066");
+        sb.append("\uff5d\236\uff5d\240\uff5d\247\uff5d\001\002\000\006\015\u0450");
+        sb.append("\237\u044f\001\002\000\024\044\077\045\134\065\036\066");
         sb.append("\203\222\u02ff\223\076\224\020\240\154\247\032\001\002");
-        sb.append("\000\004\010\u0433\001\002\000\244\003\151\004\204\005");
+        sb.append("\000\004\010\u0434\001\002\000\244\003\151\004\204\005");
         sb.append("\221\006\133\007\012\010\040\011\065\012\075\014\117");
         sb.append("\015\170\016\166\017\160\020\155\021\054\023\037\025");
         sb.append("\125\027\220\032\126\034\167\036\014\041\071\042\157");
@@ -688,7 +688,7 @@ public class EncodedActionTable1 {
         sb.append("\034\074\213\075\015\077\022\100\150\101\055\102\057");
         sb.append("\103\171\104\006\105\041\114\226\115\165\116\045\117");
         sb.append("\103\121\070\122\033\123\111\124\060\125\162\126\132");
-        sb.append("\133\100\151\u042a\172\130\173\105\177\206\200\016\202");
+        sb.append("\133\100\151\u042b\172\130\173\105\177\206\200\016\202");
         sb.append("\064\203\214\204\031\205\173\206\044\207\163\210\114");
         sb.append("\211\174\212\110\213\043\214\063\216\120\222\225\230");
         sb.append("\231\233\124\234\140\235\073\236\152\247\032\001\002");
@@ -735,7 +735,7 @@ public class EncodedActionTable1 {
         sb.append("\177\206\200\016\202\064\203\214\204\031\205\173\206");
         sb.append("\044\207\163\210\114\211\174\212\110\213\043\214\063");
         sb.append("\216\120\222\225\230\231\233\124\234\140\235\073\236");
-        sb.append("\152\247\032\001\002\000\004\230\u0420\001\002\000\114");
+        sb.append("\152\247\032\001\002\000\004\230\u0421\001\002\000\114");
         sb.append("\031\ufdf5\033\ufdf5\073\ufdf5\112\ufdf5\127\ufdf5\130\ufdf5\131");
         sb.append("\ufdf5\132\ufdf5\150\ufdf5\151\ufdf5\152\ufdf5\153\ufdf5\154\ufdf5");
         sb.append("\155\ufdf5\156\ufdf5\157\ufdf5\160\ufdf5\161\ufdf5\162\ufdf5\163");
@@ -748,7 +748,7 @@ public class EncodedActionTable1 {
         sb.append("\ufdfd\163\ufdfd\164\ufdfd\165\ufdfd\166\ufdfd\167\ufdfd\170\ufdfd");
         sb.append("\171\ufdfd\172\ufdfd\173\ufdfd\174\ufdfd\175\ufdfd\176\ufdfd\201");
         sb.append("\ufdfd\214\u011f\215\ufdfd\230\ufe16\231\ufdfd\232\ufdfd\242\ufdfd");
-        sb.append("\245\ufdfd\001\002\000\004\230\u0405\001\002\000\006\111");
+        sb.append("\245\ufdfd\001\002\000\004\230\u0406\001\002\000\006\111");
         sb.append("\u011d\214\u011f\001\002\000\114\031\ufdfc\033\ufdfc\073\ufdfc");
         sb.append("\112\ufdfc\127\ufdfc\130\ufdfc\131\ufdfc\132\ufdfc\150\ufdfc\151");
         sb.append("\ufdfc\152\ufdfc\153\ufdfc\154\ufdfc\155\ufdfc\156\ufdfc\157\ufdfc");
@@ -801,17 +801,17 @@ public class EncodedActionTable1 {
         sb.append("\045\227\051\050\054\216\062\207\063\034\074\213\075");
         sb.append("\015\077\022\100\150\101\055\102\057\103\171\104\006");
         sb.append("\105\041\114\226\115\165\116\045\117\103\121\070\122");
-        sb.append("\033\123\111\124\060\125\162\126\132\133\100\151\u03f7");
+        sb.append("\033\123\111\124\060\125\162\126\132\133\100\151\u03f8");
         sb.append("\172\130\173\105\177\206\200\016\202\064\203\214\204");
         sb.append("\031\205\173\206\044\207\163\210\114\211\174\212\110");
-        sb.append("\213\043\214\063\216\120\222\225\230\u03fb\233\124\234");
+        sb.append("\213\043\214\063\216\120\222\225\230\u03fc\233\124\234");
         sb.append("\140\235\073\236\152\247\032\001\002\000\114\031\ufd98");
         sb.append("\033\ufd98\073\ufd98\112\ufd98\127\ufd98\130\ufd98\131\ufd98\132");
         sb.append("\ufd98\150\ufd98\151\ufd98\152\ufd98\153\ufd98\154\ufd98\155\ufd98");
         sb.append("\156\ufd98\157\ufd98\160\ufd98\161\ufd98\162\ufd98\163\ufd98\164");
         sb.append("\ufd98\165\ufd98\166\ufd98\167\ufd98\170\ufd98\171\ufd98\172\ufd98");
         sb.append("\173\ufd98\174\ufd98\175\ufd98\176\ufd98\201\ufd98\215\ufd98\231");
-        sb.append("\ufd98\232\ufd98\242\ufd98\245\ufd98\001\002\000\004\113\u03f3");
+        sb.append("\ufd98\232\ufd98\242\ufd98\245\ufd98\001\002\000\004\113\u03f4");
         sb.append("\001\002\000\114\031\ufd99\033\ufd99\073\ufd99\112\ufd99\127");
         sb.append("\ufd99\130\ufd99\131\ufd99\132\ufd99\150\ufd99\151\ufd99\152\ufd99");
         sb.append("\153\ufd99\154\ufd99\155\ufd99\156\ufd99\157\ufd99\160\ufd99\161");
@@ -823,7 +823,7 @@ public class EncodedActionTable1 {
         sb.append("\150\ufe04\151\ufe04\152\ufe04\153\ufe04\154\ufe04\155\ufe04\156");
         sb.append("\ufe04\157\ufe04\160\ufe04\161\ufe04\162\ufe04\163\ufe04\164\ufe04");
         sb.append("\165\ufe04\166\ufe04\167\ufe04\170\ufe04\171\ufe04\172\ufe04\173");
-        sb.append("\ufe04\174\ufe04\175\ufe04\176\ufe04\201\ufe04\215\ufe04\230\u03ee");
+        sb.append("\ufe04\174\ufe04\175\ufe04\176\ufe04\201\ufe04\215\ufe04\230\u03ef");
         sb.append("\231\ufe04\232\ufe04\242\ufe04\245\ufe04\001\002\000\126\031");
         sb.append("\ufdb5\033\ufdb5\073\ufdb5\111\ufffc\112\ufdb5\113\ufe13\117\333");
         sb.append("\127\ufdb5\130\ufdb5\131\ufdb5\132\ufdb5\150\ufdb5\151\ufdb5\152");
@@ -841,7 +841,7 @@ public class EncodedActionTable1 {
         sb.append("\204\031\205\173\206\044\207\163\210\114\211\174\212");
         sb.append("\110\213\043\214\063\216\120\222\225\230\231\233\124");
         sb.append("\234\140\235\073\236\152\247\032\001\002\000\004\230");
-        sb.append("\u03cd\001\002\000\114\031\ufd93\033\ufd93\073\ufd93\112\ufd93");
+        sb.append("\u03ce\001\002\000\114\031\ufd93\033\ufd93\073\ufd93\112\ufd93");
         sb.append("\127\ufd93\130\ufd93\131\ufd93\132\ufd93\150\ufd93\151\ufd93\152");
         sb.append("\ufd93\153\ufd93\154\ufd93\155\ufd93\156\ufd93\157\ufd93\160\ufd93");
         sb.append("\161\ufd93\162\ufd93\163\ufd93\164\ufd93\165\ufd93\166\ufd93\167");
@@ -871,7 +871,7 @@ public class EncodedActionTable1 {
         sb.append("\203\214\204\031\205\173\206\044\207\163\210\114\211");
         sb.append("\174\212\110\213\043\214\063\216\236\222\225\230\212");
         sb.append("\233\124\234\140\235\073\236\152\247\032\001\002\000");
-        sb.append("\004\230\u03c6\001\002\000\030\010\325\012\075\016\u0112");
+        sb.append("\004\230\u03c7\001\002\000\030\010\325\012\075\016\u0112");
         sb.append("\075\015\114\u0113\117\u010d\121\070\214\320\222\322\230");
         sb.append("\231\233\124\001\002\000\130\031\ufe52\033\ufe52\071\u0122");
         sb.append("\072\u011e\073\ufe52\111\u011d\112\ufe52\113\u0120\127\ufe52\130");
@@ -903,7 +903,7 @@ public class EncodedActionTable1 {
         sb.append("\200\uffa9\202\uffa9\203\uffa9\204\uffa9\205\uffa9\206\uffa9\207");
         sb.append("\uffa9\210\uffa9\211\uffa9\212\uffa9\213\uffa9\214\uffa9\216\uffa9");
         sb.append("\222\uffa9\223\uffa9\224\uffa9\230\uffa9\233\uffa9\234\uffa9\235");
-        sb.append("\uffa9\236\uffa9\240\uffa9\247\uffa9\001\002\000\004\230\u03b3");
+        sb.append("\uffa9\236\uffa9\240\uffa9\247\uffa9\001\002\000\004\230\u03b4");
         sb.append("\001\002\000\004\230\222\001\002\000\166\004\204\006");
         sb.append("\133\007\012\010\224\011\065\012\075\015\170\016\166");
         sb.append("\032\126\036\014\044\077\045\227\054\216\062\207\063");
@@ -918,7 +918,7 @@ public class EncodedActionTable1 {
         sb.append("\271\154\250\155\261\156\272\157\276\160\263\161\243");
         sb.append("\162\260\163\275\164\273\165\256\166\254\167\274\170");
         sb.append("\267\171\262\172\277\173\255\174\266\175\264\176\244");
-        sb.append("\201\251\231\u0399\242\253\245\245\001\002\000\126\031");
+        sb.append("\201\251\231\u039a\242\253\245\245\001\002\000\126\031");
         sb.append("\uffff\033\uffff\073\uffff\111\u011d\112\uffff\113\uffff\117\uffff");
         sb.append("\127\uffff\130\uffff\131\uffff\132\uffff\150\uffff\151\uffff\152");
         sb.append("\uffff\153\uffff\154\uffff\155\uffff\156\uffff\157\uffff\160\uffff");
@@ -926,7 +926,7 @@ public class EncodedActionTable1 {
         sb.append("\uffff\170\uffff\171\uffff\172\uffff\173\uffff\174\uffff\175\uffff");
         sb.append("\176\uffff\201\uffff\214\u011f\215\uffff\230\uffff\231\uffff\232");
         sb.append("\uffff\242\uffff\245\uffff\001\002\000\010\044\u0300\045\u0301");
-        sb.append("\113\ufe14\001\002\000\004\117\u0396\001\002\000\006\156");
+        sb.append("\113\ufe14\001\002\000\004\117\u0397\001\002\000\006\156");
         sb.append("\u02e4\230\uff47\001\002\000\012\044\077\045\227\222\u02ff");
         sb.append("\247\032\001\002\000\166\004\204\006\133\007\012\010");
         sb.append("\224\011\065\012\075\015\170\016\166\032\237\036\014");
@@ -948,13 +948,13 @@ public class EncodedActionTable1 {
         sb.append("\ufd90\152\ufd90\153\ufd90\154\ufd90\155\ufd90\156\ufd90\157\ufd90");
         sb.append("\160\ufd90\161\ufd90\162\ufd90\163\ufd90\164\ufd90\165\ufd90\166");
         sb.append("\ufd90\167\ufd90\170\ufd90\171\ufd90\172\ufd90\173\ufd90\174\ufd90");
-        sb.append("\175\ufd90\176\ufd90\201\ufd90\202\ufd8e\203\ufd8e\231\u038c\242");
-        sb.append("\ufd90\243\362\245\ufd90\246\374\001\002\000\004\231\u038b");
+        sb.append("\175\ufd90\176\ufd90\201\ufd90\202\ufd8e\203\ufd8e\231\u038d\242");
+        sb.append("\ufd90\243\362\245\ufd90\246\374\001\002\000\004\231\u038c");
         sb.append("\001\002\000\076\031\ufe8a\130\ufe8a\131\ufe8a\132\ufe8a\150");
         sb.append("\ufe8a\152\ufe8a\153\ufe8a\154\ufe8a\155\ufe8a\156\ufe8a\157\ufe8a");
         sb.append("\160\ufe8a\161\ufe8a\162\ufe8a\163\ufe8a\164\ufe8a\165\ufe8a\166");
         sb.append("\ufe8a\167\ufe8a\170\ufe8a\171\ufe8a\172\ufe8a\173\ufe8a\174\ufe8a");
-        sb.append("\175\ufe8a\176\ufe8a\201\ufe8a\231\u038a\242\ufe8a\245\ufe8a\001");
+        sb.append("\175\ufe8a\176\ufe8a\201\ufe8a\231\u038b\242\ufe8a\245\ufe8a\001");
         sb.append("\002\000\032\010\325\012\075\065\342\075\015\114\331");
         sb.append("\117\316\121\070\214\320\222\322\230\330\233\124\247");
         sb.append("\032\001\002\000\166\004\204\006\133\007\012\010\224");
@@ -1054,7 +1054,7 @@ public class EncodedActionTable1 {
         sb.append("\162\126\132\133\100\172\130\173\105\177\206\200\016");
         sb.append("\202\064\203\214\204\031\205\173\206\044\207\163\210");
         sb.append("\114\211\174\212\110\213\043\214\063\216\120\222\225");
-        sb.append("\230\231\232\u037c\233\124\234\140\235\073\236\152\247");
+        sb.append("\230\231\232\u037d\233\124\234\140\235\073\236\152\247");
         sb.append("\032\001\002\000\166\004\204\006\133\007\012\010\224");
         sb.append("\011\065\012\075\015\170\016\166\032\126\036\014\044");
         sb.append("\077\045\227\054\216\062\207\063\034\074\213\075\015");
@@ -1315,7 +1315,7 @@ public class EncodedActionTable1 {
         sb.append("\162\ufd64\163\ufd64\164\ufd64\165\ufd64\166\ufd64\167\ufd64\170");
         sb.append("\ufd64\171\ufd64\172\ufd64\173\ufd64\174\ufd64\175\ufd64\176\ufd64");
         sb.append("\201\ufd64\215\ufd64\230\ufd64\231\ufd64\232\ufd64\242\ufd64\245");
-        sb.append("\ufd64\001\002\000\004\113\u036c\001\002\000\006\111\u011d");
+        sb.append("\ufd64\001\002\000\004\113\u036d\001\002\000\006\111\u011d");
         sb.append("\214\u011f\001\002\000\006\010\325\121\070\001\002\000");
         sb.append("\130\031\ufd65\033\ufd65\071\ufd65\072\ufd65\073\ufd65\111\u011d");
         sb.append("\112\ufd65\113\ufd72\127\ufd65\130\ufd65\131\ufd65\132\ufd65\150");
@@ -1326,15 +1326,15 @@ public class EncodedActionTable1 {
         sb.append("\ufd65\231\ufd65\232\ufd65\242\ufd65\245\ufd65\001\002\000\176");
         sb.append("\004\204\006\133\007\012\010\224\011\065\012\075\015");
         sb.append("\170\016\166\032\126\036\014\044\077\045\227\054\216");
-        sb.append("\062\207\063\034\074\u0358\075\015\077\022\100\150\101");
+        sb.append("\062\207\063\034\074\u0359\075\015\077\022\100\150\101");
         sb.append("\055\102\057\103\171\104\006\105\041\114\226\115\165");
         sb.append("\116\045\117\103\121\070\122\033\123\111\124\060\125");
-        sb.append("\162\126\132\127\ufd46\133\100\156\u0351\172\130\173\105");
+        sb.append("\162\126\132\127\ufd46\133\100\156\u0352\172\130\173\105");
         sb.append("\177\206\200\016\202\064\203\214\204\031\205\173\206");
         sb.append("\044\207\163\210\114\211\174\212\110\213\043\214\063");
         sb.append("\215\ufd46\216\120\222\225\230\231\233\124\234\140\235");
-        sb.append("\073\236\152\244\u0357\247\032\001\002\000\120\031\ufe0d");
-        sb.append("\033\ufe0d\073\ufe0d\112\ufe0d\113\u034f\127\ufe0d\130\ufe0d\131");
+        sb.append("\073\236\152\244\u0358\247\032\001\002\000\120\031\ufe0d");
+        sb.append("\033\ufe0d\073\ufe0d\112\ufe0d\113\u0350\127\ufe0d\130\ufe0d\131");
         sb.append("\ufe0d\132\ufe0d\150\ufe0d\151\ufe0d\152\ufe0d\153\ufe0d\154\ufe0d");
         sb.append("\155\ufe0d\156\ufe0d\157\ufe0d\160\ufe0d\161\ufe0d\162\ufe0d\163");
         sb.append("\ufe0d\164\ufe0d\165\ufe0d\166\ufe0d\167\ufe0d\170\ufe0d\171\ufe0d");
@@ -1360,7 +1360,7 @@ public class EncodedActionTable1 {
         sb.append("\uffff\165\uffff\166\uffff\167\uffff\170\uffff\171\uffff\172\uffff");
         sb.append("\173\uffff\174\uffff\175\uffff\176\uffff\201\uffff\214\uffff\215");
         sb.append("\uffff\230\uffff\231\uffff\232\uffff\242\uffff\244\uffff\245\uffff");
-        sb.append("\001\002\000\122\031\ufe09\033\ufe09\071\u0345\072\u0344\073");
+        sb.append("\001\002\000\122\031\ufe09\033\ufe09\071\u0346\072\u0345\073");
         sb.append("\ufe09\112\ufe09\127\ufe09\130\ufe09\131\ufe09\132\ufe09\150\ufe09");
         sb.append("\151\ufe09\152\ufe09\153\ufe09\154\ufe09\155\ufe09\156\ufe09\157");
         sb.append("\ufe09\160\ufe09\161\ufe09\162\ufe09\163\ufe09\164\ufe09\165\ufe09");
@@ -1402,10 +1402,10 @@ public class EncodedActionTable1 {
         sb.append("\ufe8a\152\ufe8a\153\ufe8a\154\ufe8a\155\ufe8a\156\ufe8a\157\ufe8a");
         sb.append("\160\ufe8a\161\ufe8a\162\ufe8a\163\ufe8a\164\ufe8a\165\ufe8a\166");
         sb.append("\ufe8a\167\ufe8a\170\ufe8a\171\ufe8a\172\ufe8a\173\ufe8a\174\ufe8a");
-        sb.append("\175\ufe8a\176\ufe8a\201\ufe8a\231\u0342\242\ufe8a\245\ufe8a\001");
+        sb.append("\175\ufe8a\176\ufe8a\201\ufe8a\231\u0343\242\ufe8a\245\ufe8a\001");
         sb.append("\002\000\032\010\325\012\075\065\342\075\015\114\331");
         sb.append("\117\316\121\070\214\320\222\322\230\330\233\124\247");
-        sb.append("\032\001\002\000\006\065\u033b\247\032\001\002\000\012");
+        sb.append("\032\001\002\000\006\065\u033c\247\032\001\002\000\012");
         sb.append("\067\ufe01\070\ufe01\111\ufe01\230\345\001\002\000\100\031");
         sb.append("\ufe01\130\ufe01\131\ufe01\132\ufe01\150\ufe01\152\ufe01\153\ufe01");
         sb.append("\154\ufe01\155\ufe01\156\ufe01\157\ufe01\160\ufe01\161\ufe01\162");
diff --git a/php/php.editor/src/org/netbeans/modules/php/editor/parser/EncodedActionTable10.java b/php/php.editor/src/org/netbeans/modules/php/editor/parser/EncodedActionTable10.java
index a6593da..29352d9 100644
--- a/php/php.editor/src/org/netbeans/modules/php/editor/parser/EncodedActionTable10.java
+++ b/php/php.editor/src/org/netbeans/modules/php/editor/parser/EncodedActionTable10.java
@@ -28,6 +28,14 @@ public class EncodedActionTable10 {
     }
     protected EncodedActionTable10() {
         sb = new StringBuilder();
+        sb.append("\116");
+        sb.append("\uff69");
+        sb.append("\117");
+        sb.append("\uff69");
+        sb.append("\120");
+        sb.append("\uff69");
+        sb.append("\121");
+        sb.append("\uff69");
         sb.append("\122");
         sb.append("\uff69");
         sb.append("\123");
@@ -385,7 +393,7 @@ public class EncodedActionTable10 {
         sb.append("\150");
         sb.append("\252");
         sb.append("\151");
-        sb.append("\u042c");
+        sb.append("\u042d");
         sb.append("\152");
         sb.append("\247");
         sb.append("\153");
@@ -643,13 +651,13 @@ public class EncodedActionTable10 {
         sb.append("\000");
         sb.append("\004");
         sb.append("\021");
-        sb.append("\u042e");
+        sb.append("\u042f");
         sb.append("\001");
         sb.append("\002");
         sb.append("\000");
         sb.append("\004");
         sb.append("\230");
-        sb.append("\u042f");
+        sb.append("\u0430");
         sb.append("\001");
         sb.append("\002");
         sb.append("\000");
@@ -829,7 +837,7 @@ public class EncodedActionTable10 {
         sb.append("\201");
         sb.append("\251");
         sb.append("\231");
-        sb.append("\u0431");
+        sb.append("\u0432");
         sb.append("\242");
         sb.append("\253");
         sb.append("\245");
@@ -839,7 +847,7 @@ public class EncodedActionTable10 {
         sb.append("\000");
         sb.append("\004");
         sb.append("\151");
-        sb.append("\u0432");
+        sb.append("\u0433");
         sb.append("\001");
         sb.append("\002");
         sb.append("\000");
@@ -1049,7 +1057,7 @@ public class EncodedActionTable10 {
         sb.append("\000");
         sb.append("\004");
         sb.append("\111");
-        sb.append("\u0434");
+        sb.append("\u0435");
         sb.append("\001");
         sb.append("\002");
         sb.append("\000");
@@ -1085,13 +1093,13 @@ public class EncodedActionTable10 {
         sb.append("\045");
         sb.append("\ufeaf");
         sb.append("\056");
-        sb.append("\u043d");
+        sb.append("\u043e");
         sb.append("\060");
         sb.append("\u0289");
         sb.append("\112");
-        sb.append("\u043c");
+        sb.append("\u043d");
         sb.append("\120");
-        sb.append("\u043b");
+        sb.append("\u043c");
         sb.append("\222");
         sb.append("\u0287");
         sb.append("\223");
@@ -1139,7 +1147,7 @@ public class EncodedActionTable10 {
         sb.append("\000");
         sb.append("\004");
         sb.append("\045");
-        sb.append("\u0445");
+        sb.append("\u0446");
         sb.append("\001");
         sb.append("\002");
         sb.append("\000");
@@ -1493,7 +1501,7 @@ public class EncodedActionTable10 {
         sb.append("\127");
         sb.append("\u0297");
         sb.append("\151");
-        sb.append("\u0441");
+        sb.append("\u0442");
         sb.append("\001");
         sb.append("\002");
         sb.append("\000");
@@ -1911,7 +1919,7 @@ public class EncodedActionTable10 {
         sb.append("\000");
         sb.append("\004");
         sb.append("\230");
-        sb.append("\u0448");
+        sb.append("\u0449");
         sb.append("\001");
         sb.append("\002");
         sb.append("\000");
@@ -1951,7 +1959,7 @@ public class EncodedActionTable10 {
         sb.append("\000");
         sb.append("\004");
         sb.append("\231");
-        sb.append("\u044a");
+        sb.append("\u044b");
         sb.append("\001");
         sb.append("\002");
         sb.append("\000");
@@ -2265,7 +2273,7 @@ public class EncodedActionTable10 {
         sb.append("\000");
         sb.append("\004");
         sb.append("\237");
-        sb.append("\u0450");
+        sb.append("\u0451");
         sb.append("\001");
         sb.append("\002");
         sb.append("\000");
@@ -2541,7 +2549,7 @@ public class EncodedActionTable10 {
         sb.append("\000");
         sb.append("\004");
         sb.append("\134");
-        sb.append("\u0454");
+        sb.append("\u0455");
         sb.append("\001");
         sb.append("\002");
         sb.append("\000");
@@ -2667,7 +2675,7 @@ public class EncodedActionTable10 {
         sb.append("\000");
         sb.append("\006");
         sb.append("\067");
-        sb.append("\u0458");
+        sb.append("\u0459");
         sb.append("\111");
         sb.append("\uff2c");
         sb.append("\001");
@@ -2675,7 +2683,7 @@ public class EncodedActionTable10 {
         sb.append("\000");
         sb.append("\004");
         sb.append("\111");
-        sb.append("\u045a");
+        sb.append("\u045b");
         sb.append("\001");
         sb.append("\002");
         sb.append("\000");
@@ -2729,9 +2737,9 @@ public class EncodedActionTable10 {
         sb.append("\046");
         sb.append("\ufeb6");
         sb.append("\112");
-        sb.append("\u045f");
+        sb.append("\u0460");
         sb.append("\120");
-        sb.append("\u0462");
+        sb.append("\u0463");
         sb.append("\222");
         sb.append("\u0287");
         sb.append("\223");
@@ -3013,7 +3021,7 @@ public class EncodedActionTable10 {
         sb.append("\000");
         sb.append("\004");
         sb.append("\045");
-        sb.append("\u0463");
+        sb.append("\u0464");
         sb.append("\001");
         sb.append("\002");
         sb.append("\000");
@@ -3361,7 +3369,7 @@ public class EncodedActionTable10 {
         sb.append("\000");
         sb.append("\004");
         sb.append("\230");
-        sb.append("\u0466");
+        sb.append("\u0467");
         sb.append("\001");
         sb.append("\002");
         sb.append("\000");
@@ -3401,7 +3409,7 @@ public class EncodedActionTable10 {
         sb.append("\000");
         sb.append("\004");
         sb.append("\231");
-        sb.append("\u0468");
+        sb.append("\u0469");
         sb.append("\001");
         sb.append("\002");
         sb.append("\000");
@@ -3415,7 +3423,7 @@ public class EncodedActionTable10 {
         sb.append("\000");
         sb.append("\004");
         sb.append("\151");
-        sb.append("\u046a");
+        sb.append("\u046b");
         sb.append("\001");
         sb.append("\002");
         sb.append("\000");
@@ -3457,7 +3465,7 @@ public class EncodedActionTable10 {
         sb.append("\127");
         sb.append("\u02db");
         sb.append("\151");
-        sb.append("\u046d");
+        sb.append("\u046e");
         sb.append("\001");
         sb.append("\002");
         sb.append("\000");
@@ -3499,13 +3507,13 @@ public class EncodedActionTable10 {
         sb.append("\012");
         sb.append("\075");
         sb.append("\015");
-        sb.append("\u0475");
+        sb.append("\u0476");
         sb.append("\107");
-        sb.append("\u0474");
+        sb.append("\u0475");
         sb.append("\110");
-        sb.append("\u0473");
+        sb.append("\u0474");
         sb.append("\234");
-        sb.append("\u0472");
+        sb.append("\u0473");
         sb.append("\001");
         sb.append("\002");
         sb.append("\000");
@@ -3515,9 +3523,9 @@ public class EncodedActionTable10 {
         sb.append("\015");
         sb.append("\ufd3a");
         sb.append("\071");
-        sb.append("\u0481");
+        sb.append("\u0482");
         sb.append("\072");
-        sb.append("\u047f");
+        sb.append("\u0480");
         sb.append("\106");
         sb.append("\ufd3a");
         sb.append("\107");
@@ -3525,7 +3533,7 @@ public class EncodedActionTable10 {
         sb.append("\110");
         sb.append("\ufd3a");
         sb.append("\214");
-        sb.append("\u0480");
+        sb.append("\u0481");
         sb.append("\234");
         sb.append("\ufd3a");
         sb.append("\235");
@@ -3665,7 +3673,7 @@ public class EncodedActionTable10 {
         sb.append("\010");
         sb.append("\224");
         sb.append("\011");
-        sb.append("\u0477");
+        sb.append("\u0478");
         sb.append("\012");
         sb.append("\075");
         sb.append("\015");
@@ -3797,7 +3805,7 @@ public class EncodedActionTable10 {
         sb.append("\031");
         sb.append("\270");
         sb.append("\112");
-        sb.append("\u047c");
+        sb.append("\u047d");
         sb.append("\130");
         sb.append("\257");
         sb.append("\131");
@@ -3915,7 +3923,7 @@ public class EncodedActionTable10 {
         sb.append("\201");
         sb.append("\ufdb7");
         sb.append("\214");
-        sb.append("\u0478");
+        sb.append("\u0479");
         sb.append("\242");
         sb.append("\ufdb7");
         sb.append("\245");
@@ -4099,7 +4107,7 @@ public class EncodedActionTable10 {
         sb.append("\201");
         sb.append("\251");
         sb.append("\215");
-        sb.append("\u047a");
+        sb.append("\u047b");
         sb.append("\242");
         sb.append("\253");
         sb.append("\245");
@@ -4109,7 +4117,7 @@ public class EncodedActionTable10 {
         sb.append("\000");
         sb.append("\004");
         sb.append("\112");
-        sb.append("\u047b");
+        sb.append("\u047c");
         sb.append("\001");
         sb.append("\002");
         sb.append("\000");
@@ -4151,7 +4159,7 @@ public class EncodedActionTable10 {
         sb.append("\000");
         sb.append("\004");
         sb.append("\112");
-        sb.append("\u047e");
+        sb.append("\u047f");
         sb.append("\001");
         sb.append("\002");
         sb.append("\000");
@@ -4187,7 +4195,7 @@ public class EncodedActionTable10 {
         sb.append("\012");
         sb.append("\075");
         sb.append("\013");
-        sb.append("\u0486");
+        sb.append("\u0487");
         sb.append("\121");
         sb.append("\u0129");
         sb.append("\001");
@@ -4227,7 +4235,7 @@ public class EncodedActionTable10 {
         sb.append("\000");
         sb.append("\004");
         sb.append("\215");
-        sb.append("\u0487");
+        sb.append("\u0488");
         sb.append("\001");
         sb.append("\002");
         sb.append("\000");
@@ -4285,13 +4293,13 @@ public class EncodedActionTable10 {
         sb.append("\121");
         sb.append("\u0129");
         sb.append("\230");
-        sb.append("\u038e");
+        sb.append("\u038f");
         sb.append("\001");
         sb.append("\002");
         sb.append("\000");
         sb.append("\004");
         sb.append("\230");
-        sb.append("\u048b");
+        sb.append("\u048c");
         sb.append("\001");
         sb.append("\002");
         sb.append("\000");
@@ -4331,7 +4339,7 @@ public class EncodedActionTable10 {
         sb.append("\000");
         sb.append("\004");
         sb.append("\231");
-        sb.append("\u048d");
+        sb.append("\u048e");
         sb.append("\001");
         sb.append("\002");
         sb.append("\000");
@@ -4345,7 +4353,7 @@ public class EncodedActionTable10 {
         sb.append("\000");
         sb.append("\004");
         sb.append("\111");
-        sb.append("\u048f");
+        sb.append("\u0490");
         sb.append("\001");
         sb.append("\002");
         sb.append("\000");
@@ -4520,13 +4528,5 @@ public class EncodedActionTable10 {
         sb.append("\uff80");
         sb.append("\236");
         sb.append("\uff80");
-        sb.append("\240");
-        sb.append("\uff80");
-        sb.append("\247");
-        sb.append("\uff80");
-        sb.append("\001");
-        sb.append("\002");
-        sb.append("\000");
-        sb.append("\260");
     }
 }
\ No newline at end of file
diff --git a/php/php.editor/src/org/netbeans/modules/php/editor/parser/EncodedActionTable11.java b/php/php.editor/src/org/netbeans/modules/php/editor/parser/EncodedActionTable11.java
index bdbb9e9..7609695 100644
--- a/php/php.editor/src/org/netbeans/modules/php/editor/parser/EncodedActionTable11.java
+++ b/php/php.editor/src/org/netbeans/modules/php/editor/parser/EncodedActionTable11.java
@@ -28,6 +28,14 @@ public class EncodedActionTable11 {
     }
     protected EncodedActionTable11() {
         sb = new StringBuilder();
+        sb.append("\240");
+        sb.append("\uff80");
+        sb.append("\247");
+        sb.append("\uff80");
+        sb.append("\001");
+        sb.append("\002");
+        sb.append("\000");
+        sb.append("\260");
         sb.append("\003");
         sb.append("\151");
         sb.append("\004");
@@ -123,7 +131,7 @@ public class EncodedActionTable11 {
         sb.append("\111");
         sb.append("\101");
         sb.append("\112");
-        sb.append("\u0491");
+        sb.append("\u0492");
         sb.append("\114");
         sb.append("\226");
         sb.append("\115");
@@ -767,7 +775,7 @@ public class EncodedActionTable11 {
         sb.append("\031");
         sb.append("\ufd90");
         sb.append("\033");
-        sb.append("\u04ae");
+        sb.append("\u04af");
         sb.append("\130");
         sb.append("\ufd90");
         sb.append("\131");
@@ -863,7 +871,7 @@ public class EncodedActionTable11 {
         sb.append("\031");
         sb.append("\ufd98");
         sb.append("\033");
-        sb.append("\u0498");
+        sb.append("\u0499");
         sb.append("\130");
         sb.append("\ufd98");
         sb.append("\131");
@@ -931,7 +939,7 @@ public class EncodedActionTable11 {
         sb.append("\016");
         sb.append("\u0112");
         sb.append("\074");
-        sb.append("\u049d");
+        sb.append("\u049e");
         sb.append("\075");
         sb.append("\015");
         sb.append("\114");
@@ -941,9 +949,9 @@ public class EncodedActionTable11 {
         sb.append("\121");
         sb.append("\070");
         sb.append("\156");
-        sb.append("\u049c");
+        sb.append("\u049d");
         sb.append("\214");
-        sb.append("\u049a");
+        sb.append("\u049b");
         sb.append("\222");
         sb.append("\322");
         sb.append("\230");
@@ -955,7 +963,7 @@ public class EncodedActionTable11 {
         sb.append("\000");
         sb.append("\006");
         sb.append("\073");
-        sb.append("\u04a5");
+        sb.append("\u04a6");
         sb.append("\231");
         sb.append("\uff26");
         sb.append("\001");
@@ -993,7 +1001,7 @@ public class EncodedActionTable11 {
         sb.append("\063");
         sb.append("\034");
         sb.append("\074");
-        sb.append("\u0358");
+        sb.append("\u0359");
         sb.append("\075");
         sb.append("\015");
         sb.append("\077");
@@ -1035,7 +1043,7 @@ public class EncodedActionTable11 {
         sb.append("\133");
         sb.append("\100");
         sb.append("\156");
-        sb.append("\u0351");
+        sb.append("\u0352");
         sb.append("\172");
         sb.append("\130");
         sb.append("\173");
@@ -1083,7 +1091,7 @@ public class EncodedActionTable11 {
         sb.append("\236");
         sb.append("\152");
         sb.append("\244");
-        sb.append("\u0357");
+        sb.append("\u0358");
         sb.append("\247");
         sb.append("\032");
         sb.append("\001");
@@ -1125,7 +1133,7 @@ public class EncodedActionTable11 {
         sb.append("\000");
         sb.append("\004");
         sb.append("\230");
-        sb.append("\u049e");
+        sb.append("\u049f");
         sb.append("\001");
         sb.append("\002");
         sb.append("\000");
@@ -1161,7 +1169,7 @@ public class EncodedActionTable11 {
         sb.append("\063");
         sb.append("\034");
         sb.append("\074");
-        sb.append("\u0358");
+        sb.append("\u0359");
         sb.append("\075");
         sb.append("\015");
         sb.append("\077");
@@ -1203,7 +1211,7 @@ public class EncodedActionTable11 {
         sb.append("\133");
         sb.append("\100");
         sb.append("\156");
-        sb.append("\u0351");
+        sb.append("\u0352");
         sb.append("\172");
         sb.append("\130");
         sb.append("\173");
@@ -1251,7 +1259,7 @@ public class EncodedActionTable11 {
         sb.append("\236");
         sb.append("\152");
         sb.append("\244");
-        sb.append("\u0357");
+        sb.append("\u0358");
         sb.append("\247");
         sb.append("\032");
         sb.append("\001");
@@ -1259,7 +1267,7 @@ public class EncodedActionTable11 {
         sb.append("\000");
         sb.append("\004");
         sb.append("\231");
-        sb.append("\u04a0");
+        sb.append("\u04a1");
         sb.append("\001");
         sb.append("\002");
         sb.append("\000");
@@ -1281,7 +1289,7 @@ public class EncodedActionTable11 {
         sb.append("\000");
         sb.append("\004");
         sb.append("\215");
-        sb.append("\u04a3");
+        sb.append("\u04a4");
         sb.append("\001");
         sb.append("\002");
         sb.append("\000");
@@ -1301,7 +1309,7 @@ public class EncodedActionTable11 {
         sb.append("\000");
         sb.append("\004");
         sb.append("\231");
-        sb.append("\u04a7");
+        sb.append("\u04a8");
         sb.append("\001");
         sb.append("\002");
         sb.append("\000");
@@ -1313,7 +1321,7 @@ public class EncodedActionTable11 {
         sb.append("\016");
         sb.append("\u0112");
         sb.append("\074");
-        sb.append("\u049d");
+        sb.append("\u049e");
         sb.append("\075");
         sb.append("\015");
         sb.append("\114");
@@ -1323,9 +1331,9 @@ public class EncodedActionTable11 {
         sb.append("\121");
         sb.append("\070");
         sb.append("\156");
-        sb.append("\u049c");
+        sb.append("\u049d");
         sb.append("\214");
-        sb.append("\u049a");
+        sb.append("\u049b");
         sb.append("\222");
         sb.append("\322");
         sb.append("\230");
@@ -1495,7 +1503,7 @@ public class EncodedActionTable11 {
         sb.append("\230");
         sb.append("\212");
         sb.append("\232");
-        sb.append("\u04a8");
+        sb.append("\u04a9");
         sb.append("\233");
         sb.append("\124");
         sb.append("\234");
@@ -2129,7 +2137,7 @@ public class EncodedActionTable11 {
         sb.append("\025");
         sb.append("\125");
         sb.append("\026");
-        sb.append("\u04ac");
+        sb.append("\u04ad");
         sb.append("\027");
         sb.append("\220");
         sb.append("\032");
@@ -2275,7 +2283,7 @@ public class EncodedActionTable11 {
         sb.append("\000");
         sb.append("\004");
         sb.append("\151");
-        sb.append("\u04ad");
+        sb.append("\u04ae");
         sb.append("\001");
         sb.append("\002");
         sb.append("\000");
@@ -2491,7 +2499,7 @@ public class EncodedActionTable11 {
         sb.append("\016");
         sb.append("\u0112");
         sb.append("\074");
-        sb.append("\u049d");
+        sb.append("\u049e");
         sb.append("\075");
         sb.append("\015");
         sb.append("\114");
@@ -2501,9 +2509,9 @@ public class EncodedActionTable11 {
         sb.append("\121");
         sb.append("\070");
         sb.append("\156");
-        sb.append("\u049c");
+        sb.append("\u049d");
         sb.append("\214");
-        sb.append("\u049a");
+        sb.append("\u049b");
         sb.append("\222");
         sb.append("\322");
         sb.append("\230");
@@ -2515,7 +2523,7 @@ public class EncodedActionTable11 {
         sb.append("\000");
         sb.append("\006");
         sb.append("\073");
-        sb.append("\u04a5");
+        sb.append("\u04a6");
         sb.append("\231");
         sb.append("\uff26");
         sb.append("\001");
@@ -2523,7 +2531,7 @@ public class EncodedActionTable11 {
         sb.append("\000");
         sb.append("\004");
         sb.append("\231");
-        sb.append("\u04b1");
+        sb.append("\u04b2");
         sb.append("\001");
         sb.append("\002");
         sb.append("\000");
@@ -2681,7 +2689,7 @@ public class EncodedActionTable11 {
         sb.append("\230");
         sb.append("\212");
         sb.append("\232");
-        sb.append("\u04a8");
+        sb.append("\u04a9");
         sb.append("\233");
         sb.append("\124");
         sb.append("\234");
@@ -3239,11 +3247,11 @@ public class EncodedActionTable11 {
         sb.append("\000");
         sb.append("\010");
         sb.append("\111");
-        sb.append("\u04b7");
+        sb.append("\u04b8");
         sb.append("\117");
         sb.append("\333");
         sb.append("\151");
-        sb.append("\u04b8");
+        sb.append("\u04b9");
         sb.append("\001");
         sb.append("\002");
         sb.append("\000");
@@ -3713,7 +3721,7 @@ public class EncodedActionTable11 {
         sb.append("\111");
         sb.append("\101");
         sb.append("\112");
-        sb.append("\u04ba");
+        sb.append("\u04bb");
         sb.append("\114");
         sb.append("\122");
         sb.append("\115");
@@ -4079,7 +4087,7 @@ public class EncodedActionTable11 {
         sb.append("\111");
         sb.append("\101");
         sb.append("\112");
-        sb.append("\u04bc");
+        sb.append("\u04bd");
         sb.append("\114");
         sb.append("\122");
         sb.append("\115");
@@ -4381,7 +4389,7 @@ public class EncodedActionTable11 {
         sb.append("\000");
         sb.append("\006");
         sb.append("\127");
-        sb.append("\u04c1");
+        sb.append("\u04c2");
         sb.append("\231");
         sb.append("\ufdac");
         sb.append("\001");
@@ -4425,13 +4433,13 @@ public class EncodedActionTable11 {
         sb.append("\000");
         sb.append("\004");
         sb.append("\231");
-        sb.append("\u04c3");
+        sb.append("\u04c4");
         sb.append("\001");
         sb.append("\002");
         sb.append("\000");
         sb.append("\004");
         sb.append("\151");
-        sb.append("\u04c4");
+        sb.append("\u04c5");
         sb.append("\001");
         sb.append("\002");
         sb.append("\000");
@@ -4520,13 +4528,5 @@ public class EncodedActionTable11 {
         sb.append("\uff65");
         sb.append("\061");
         sb.append("\uff65");
-        sb.append("\062");
-        sb.append("\uff65");
-        sb.append("\063");
-        sb.append("\uff65");
-        sb.append("\064");
-        sb.append("\uff65");
-        sb.append("\065");
-        sb.append("\uff65");
     }
 }
\ No newline at end of file
diff --git a/php/php.editor/src/org/netbeans/modules/php/editor/parser/EncodedActionTable12.java b/php/php.editor/src/org/netbeans/modules/php/editor/parser/EncodedActionTable12.java
index f93b6f6..15d9c6c 100644
--- a/php/php.editor/src/org/netbeans/modules/php/editor/parser/EncodedActionTable12.java
+++ b/php/php.editor/src/org/netbeans/modules/php/editor/parser/EncodedActionTable12.java
@@ -28,6 +28,14 @@ public class EncodedActionTable12 {
     }
     protected EncodedActionTable12() {
         sb = new StringBuilder();
+        sb.append("\062");
+        sb.append("\uff65");
+        sb.append("\063");
+        sb.append("\uff65");
+        sb.append("\064");
+        sb.append("\uff65");
+        sb.append("\065");
+        sb.append("\uff65");
         sb.append("\066");
         sb.append("\uff65");
         sb.append("\074");
@@ -385,7 +393,7 @@ public class EncodedActionTable12 {
         sb.append("\000");
         sb.append("\004");
         sb.append("\151");
-        sb.append("\u04ca");
+        sb.append("\u04cb");
         sb.append("\001");
         sb.append("\002");
         sb.append("\000");
@@ -1419,7 +1427,7 @@ public class EncodedActionTable12 {
         sb.append("\111");
         sb.append("\101");
         sb.append("\112");
-        sb.append("\u04d3");
+        sb.append("\u04d4");
         sb.append("\114");
         sb.append("\226");
         sb.append("\115");
@@ -1785,7 +1793,7 @@ public class EncodedActionTable12 {
         sb.append("\000");
         sb.append("\004");
         sb.append("\230");
-        sb.append("\u04d6");
+        sb.append("\u04d7");
         sb.append("\001");
         sb.append("\002");
         sb.append("\000");
@@ -1825,7 +1833,7 @@ public class EncodedActionTable12 {
         sb.append("\000");
         sb.append("\004");
         sb.append("\231");
-        sb.append("\u04d8");
+        sb.append("\u04d9");
         sb.append("\001");
         sb.append("\002");
         sb.append("\000");
@@ -1839,13 +1847,13 @@ public class EncodedActionTable12 {
         sb.append("\000");
         sb.append("\004");
         sb.append("\073");
-        sb.append("\u04da");
+        sb.append("\u04db");
         sb.append("\001");
         sb.append("\002");
         sb.append("\000");
         sb.append("\174");
         sb.append("\003");
-        sb.append("\u031e");
+        sb.append("\u031f");
         sb.append("\004");
         sb.append("\204");
         sb.append("\006");
@@ -2387,13 +2395,13 @@ public class EncodedActionTable12 {
         sb.append("\012");
         sb.append("\075");
         sb.append("\015");
-        sb.append("\u0475");
+        sb.append("\u0476");
         sb.append("\107");
-        sb.append("\u0474");
+        sb.append("\u0475");
         sb.append("\110");
-        sb.append("\u0473");
+        sb.append("\u0474");
         sb.append("\235");
-        sb.append("\u04e1");
+        sb.append("\u04e2");
         sb.append("\001");
         sb.append("\002");
         sb.append("\000");
@@ -2691,7 +2699,7 @@ public class EncodedActionTable12 {
         sb.append("\150");
         sb.append("\252");
         sb.append("\151");
-        sb.append("\u04e4");
+        sb.append("\u04e5");
         sb.append("\152");
         sb.append("\247");
         sb.append("\153");
@@ -3027,7 +3035,7 @@ public class EncodedActionTable12 {
         sb.append("\000");
         sb.append("\004");
         sb.append("\215");
-        sb.append("\u04e7");
+        sb.append("\u04e8");
         sb.append("\001");
         sb.append("\002");
         sb.append("\000");
@@ -3051,7 +3059,7 @@ public class EncodedActionTable12 {
         sb.append("\132");
         sb.append("\ufd66");
         sb.append("\134");
-        sb.append("\u04e8");
+        sb.append("\u04e9");
         sb.append("\150");
         sb.append("\ufd66");
         sb.append("\151");
@@ -4520,13 +4528,5 @@ public class EncodedActionTable12 {
         sb.append("\031");
         sb.append("\205");
         sb.append("\173");
-        sb.append("\206");
-        sb.append("\044");
-        sb.append("\207");
-        sb.append("\163");
-        sb.append("\210");
-        sb.append("\114");
-        sb.append("\211");
-        sb.append("\174");
     }
 }
\ No newline at end of file
diff --git a/php/php.editor/src/org/netbeans/modules/php/editor/parser/EncodedActionTable13.java b/php/php.editor/src/org/netbeans/modules/php/editor/parser/EncodedActionTable13.java
index 9e36b9a..2623eba 100644
--- a/php/php.editor/src/org/netbeans/modules/php/editor/parser/EncodedActionTable13.java
+++ b/php/php.editor/src/org/netbeans/modules/php/editor/parser/EncodedActionTable13.java
@@ -28,6 +28,14 @@ public class EncodedActionTable13 {
     }
     protected EncodedActionTable13() {
         sb = new StringBuilder();
+        sb.append("\206");
+        sb.append("\044");
+        sb.append("\207");
+        sb.append("\163");
+        sb.append("\210");
+        sb.append("\114");
+        sb.append("\211");
+        sb.append("\174");
         sb.append("\212");
         sb.append("\110");
         sb.append("\213");
@@ -109,7 +117,7 @@ public class EncodedActionTable13 {
         sb.append("\201");
         sb.append("\251");
         sb.append("\231");
-        sb.append("\u04f7");
+        sb.append("\u04f8");
         sb.append("\242");
         sb.append("\253");
         sb.append("\245");
@@ -215,7 +223,7 @@ public class EncodedActionTable13 {
         sb.append("\000");
         sb.append("\004");
         sb.append("\111");
-        sb.append("\u04fb");
+        sb.append("\u04fc");
         sb.append("\001");
         sb.append("\002");
         sb.append("\000");
@@ -259,7 +267,7 @@ public class EncodedActionTable13 {
         sb.append("\060");
         sb.append("\u0289");
         sb.append("\112");
-        sb.append("\u04fd");
+        sb.append("\u04fe");
         sb.append("\120");
         sb.append("\u0283");
         sb.append("\222");
@@ -659,7 +667,7 @@ public class EncodedActionTable13 {
         sb.append("\201");
         sb.append("\251");
         sb.append("\231");
-        sb.append("\u0500");
+        sb.append("\u0501");
         sb.append("\242");
         sb.append("\253");
         sb.append("\245");
@@ -821,7 +829,7 @@ public class EncodedActionTable13 {
         sb.append("\230");
         sb.append("\212");
         sb.append("\232");
-        sb.append("\u0501");
+        sb.append("\u0502");
         sb.append("\233");
         sb.append("\124");
         sb.append("\234");
@@ -1451,7 +1459,7 @@ public class EncodedActionTable13 {
         sb.append("\021");
         sb.append("\054");
         sb.append("\022");
-        sb.append("\u0505");
+        sb.append("\u0506");
         sb.append("\023");
         sb.append("\037");
         sb.append("\025");
@@ -1601,7 +1609,7 @@ public class EncodedActionTable13 {
         sb.append("\000");
         sb.append("\004");
         sb.append("\151");
-        sb.append("\u0506");
+        sb.append("\u0507");
         sb.append("\001");
         sb.append("\002");
         sb.append("\000");
@@ -2707,7 +2715,7 @@ public class EncodedActionTable13 {
         sb.append("\000");
         sb.append("\004");
         sb.append("\231");
-        sb.append("\u050f");
+        sb.append("\u0510");
         sb.append("\001");
         sb.append("\002");
         sb.append("\000");
@@ -3483,7 +3491,7 @@ public class EncodedActionTable13 {
         sb.append("\127");
         sb.append("\ufed8");
         sb.append("\134");
-        sb.append("\u051c");
+        sb.append("\u051d");
         sb.append("\151");
         sb.append("\ufed8");
         sb.append("\001");
@@ -3491,15 +3499,15 @@ public class EncodedActionTable13 {
         sb.append("\000");
         sb.append("\006");
         sb.append("\127");
-        sb.append("\u0517");
-        sb.append("\151");
         sb.append("\u0518");
+        sb.append("\151");
+        sb.append("\u0519");
         sb.append("\001");
         sb.append("\002");
         sb.append("\000");
         sb.append("\004");
         sb.append("\012");
-        sb.append("\u0519");
+        sb.append("\u051a");
         sb.append("\001");
         sb.append("\002");
         sb.append("\000");
@@ -3711,7 +3719,7 @@ public class EncodedActionTable13 {
         sb.append("\127");
         sb.append("\ufeda");
         sb.append("\134");
-        sb.append("\u051a");
+        sb.append("\u051b");
         sb.append("\151");
         sb.append("\ufeda");
         sb.append("\001");
@@ -4197,7 +4205,7 @@ public class EncodedActionTable13 {
         sb.append("\111");
         sb.append("\101");
         sb.append("\112");
-        sb.append("\u0521");
+        sb.append("\u0522");
         sb.append("\114");
         sb.append("\226");
         sb.append("\115");
@@ -4281,21 +4289,21 @@ public class EncodedActionTable13 {
         sb.append("\000");
         sb.append("\006");
         sb.append("\053");
-        sb.append("\u0522");
-        sb.append("\055");
         sb.append("\u0523");
+        sb.append("\055");
+        sb.append("\u0524");
         sb.append("\001");
         sb.append("\002");
         sb.append("\000");
         sb.append("\004");
         sb.append("\230");
-        sb.append("\u0527");
+        sb.append("\u0528");
         sb.append("\001");
         sb.append("\002");
         sb.append("\000");
         sb.append("\004");
         sb.append("\111");
-        sb.append("\u0524");
+        sb.append("\u0525");
         sb.append("\001");
         sb.append("\002");
         sb.append("\000");
@@ -4520,13 +4528,5 @@ public class EncodedActionTable13 {
         sb.append("\014");
         sb.append("\041");
         sb.append("\071");
-        sb.append("\042");
-        sb.append("\157");
-        sb.append("\043");
-        sb.append("\113");
-        sb.append("\044");
-        sb.append("\077");
-        sb.append("\045");
-        sb.append("\134");
     }
 }
\ No newline at end of file
diff --git a/php/php.editor/src/org/netbeans/modules/php/editor/parser/EncodedActionTable14.java b/php/php.editor/src/org/netbeans/modules/php/editor/parser/EncodedActionTable14.java
index 538bec8..27956b8 100644
--- a/php/php.editor/src/org/netbeans/modules/php/editor/parser/EncodedActionTable14.java
+++ b/php/php.editor/src/org/netbeans/modules/php/editor/parser/EncodedActionTable14.java
@@ -28,6 +28,14 @@ public class EncodedActionTable14 {
     }
     protected EncodedActionTable14() {
         sb = new StringBuilder();
+        sb.append("\042");
+        sb.append("\157");
+        sb.append("\043");
+        sb.append("\113");
+        sb.append("\044");
+        sb.append("\077");
+        sb.append("\045");
+        sb.append("\134");
         sb.append("\047");
         sb.append("\177");
         sb.append("\050");
@@ -73,7 +81,7 @@ public class EncodedActionTable14 {
         sb.append("\111");
         sb.append("\101");
         sb.append("\112");
-        sb.append("\u0526");
+        sb.append("\u0527");
         sb.append("\114");
         sb.append("\226");
         sb.append("\115");
@@ -383,7 +391,7 @@ public class EncodedActionTable14 {
         sb.append("\012");
         sb.append("\uff52");
         sb.append("\154");
-        sb.append("\u052b");
+        sb.append("\u052c");
         sb.append("\231");
         sb.append("\uff52");
         sb.append("\001");
@@ -423,7 +431,7 @@ public class EncodedActionTable14 {
         sb.append("\012");
         sb.append("\uff53");
         sb.append("\154");
-        sb.append("\u052b");
+        sb.append("\u052c");
         sb.append("\231");
         sb.append("\uff53");
         sb.append("\001");
@@ -457,13 +465,13 @@ public class EncodedActionTable14 {
         sb.append("\000");
         sb.append("\004");
         sb.append("\231");
-        sb.append("\u0532");
+        sb.append("\u0533");
         sb.append("\001");
         sb.append("\002");
         sb.append("\000");
         sb.append("\004");
         sb.append("\111");
-        sb.append("\u0533");
+        sb.append("\u0534");
         sb.append("\001");
         sb.append("\002");
         sb.append("\000");
@@ -741,7 +749,7 @@ public class EncodedActionTable14 {
         sb.append("\111");
         sb.append("\101");
         sb.append("\112");
-        sb.append("\u0535");
+        sb.append("\u0536");
         sb.append("\114");
         sb.append("\226");
         sb.append("\115");
@@ -901,7 +909,7 @@ public class EncodedActionTable14 {
         sb.append("\052");
         sb.append("\uff5a");
         sb.append("\053");
-        sb.append("\u0536");
+        sb.append("\u0537");
         sb.append("\054");
         sb.append("\uff5a");
         sb.append("\055");
@@ -1033,7 +1041,7 @@ public class EncodedActionTable14 {
         sb.append("\000");
         sb.append("\004");
         sb.append("\230");
-        sb.append("\u0540");
+        sb.append("\u0541");
         sb.append("\001");
         sb.append("\002");
         sb.append("\000");
@@ -1117,7 +1125,7 @@ public class EncodedActionTable14 {
         sb.append("\054");
         sb.append("\uff56");
         sb.append("\055");
-        sb.append("\u053c");
+        sb.append("\u053d");
         sb.append("\056");
         sb.append("\uff56");
         sb.append("\057");
@@ -1529,7 +1537,7 @@ public class EncodedActionTable14 {
         sb.append("\052");
         sb.append("\uff5b");
         sb.append("\053");
-        sb.append("\u0536");
+        sb.append("\u0537");
         sb.append("\054");
         sb.append("\uff5b");
         sb.append("\055");
@@ -2073,7 +2081,7 @@ public class EncodedActionTable14 {
         sb.append("\000");
         sb.append("\004");
         sb.append("\111");
-        sb.append("\u053d");
+        sb.append("\u053e");
         sb.append("\001");
         sb.append("\002");
         sb.append("\000");
@@ -2351,7 +2359,7 @@ public class EncodedActionTable14 {
         sb.append("\111");
         sb.append("\101");
         sb.append("\112");
-        sb.append("\u053f");
+        sb.append("\u0540");
         sb.append("\114");
         sb.append("\226");
         sb.append("\115");
@@ -2659,13 +2667,13 @@ public class EncodedActionTable14 {
         sb.append("\000");
         sb.append("\004");
         sb.append("\231");
-        sb.append("\u0543");
+        sb.append("\u0544");
         sb.append("\001");
         sb.append("\002");
         sb.append("\000");
         sb.append("\004");
         sb.append("\111");
-        sb.append("\u0544");
+        sb.append("\u0545");
         sb.append("\001");
         sb.append("\002");
         sb.append("\000");
@@ -2943,7 +2951,7 @@ public class EncodedActionTable14 {
         sb.append("\111");
         sb.append("\101");
         sb.append("\112");
-        sb.append("\u0546");
+        sb.append("\u0547");
         sb.append("\114");
         sb.append("\226");
         sb.append("\115");
@@ -3393,13 +3401,13 @@ public class EncodedActionTable14 {
         sb.append("\012");
         sb.append("\075");
         sb.append("\015");
-        sb.append("\u0475");
+        sb.append("\u0476");
         sb.append("\106");
-        sb.append("\u054a");
+        sb.append("\u054b");
         sb.append("\107");
-        sb.append("\u0474");
+        sb.append("\u0475");
         sb.append("\110");
-        sb.append("\u0473");
+        sb.append("\u0474");
         sb.append("\001");
         sb.append("\002");
         sb.append("\000");
@@ -3877,13 +3885,13 @@ public class EncodedActionTable14 {
         sb.append("\000");
         sb.append("\004");
         sb.append("\151");
-        sb.append("\u0552");
+        sb.append("\u0553");
         sb.append("\001");
         sb.append("\002");
         sb.append("\000");
         sb.append("\010");
         sb.append("\127");
-        sb.append("\u0550");
+        sb.append("\u0551");
         sb.append("\151");
         sb.append("\ufe8e");
         sb.append("\231");
@@ -4203,7 +4211,7 @@ public class EncodedActionTable14 {
         sb.append("\000");
         sb.append("\004");
         sb.append("\151");
-        sb.append("\u0554");
+        sb.append("\u0555");
         sb.append("\001");
         sb.append("\002");
         sb.append("\000");
@@ -4331,7 +4339,7 @@ public class EncodedActionTable14 {
         sb.append("\000");
         sb.append("\004");
         sb.append("\231");
-        sb.append("\u0556");
+        sb.append("\u0557");
         sb.append("\001");
         sb.append("\002");
         sb.append("\000");
@@ -4489,7 +4497,7 @@ public class EncodedActionTable14 {
         sb.append("\230");
         sb.append("\212");
         sb.append("\232");
-        sb.append("\u0558");
+        sb.append("\u0559");
         sb.append("\233");
         sb.append("\124");
         sb.append("\234");
@@ -4520,13 +4528,5 @@ public class EncodedActionTable14 {
         sb.append("\uff75");
         sb.append("\011");
         sb.append("\uff75");
-        sb.append("\012");
-        sb.append("\uff75");
-        sb.append("\014");
-        sb.append("\uff75");
-        sb.append("\015");
-        sb.append("\uff75");
-        sb.append("\016");
-        sb.append("\uff75");
     }
 }
\ No newline at end of file
diff --git a/php/php.editor/src/org/netbeans/modules/php/editor/parser/EncodedActionTable15.java b/php/php.editor/src/org/netbeans/modules/php/editor/parser/EncodedActionTable15.java
index 8de16df..73b727b 100644
--- a/php/php.editor/src/org/netbeans/modules/php/editor/parser/EncodedActionTable15.java
+++ b/php/php.editor/src/org/netbeans/modules/php/editor/parser/EncodedActionTable15.java
@@ -28,6 +28,14 @@ public class EncodedActionTable15 {
     }
     protected EncodedActionTable15() {
         sb = new StringBuilder();
+        sb.append("\012");
+        sb.append("\uff75");
+        sb.append("\014");
+        sb.append("\uff75");
+        sb.append("\015");
+        sb.append("\uff75");
+        sb.append("\016");
+        sb.append("\uff75");
         sb.append("\017");
         sb.append("\uff75");
         sb.append("\020");
@@ -621,7 +629,7 @@ public class EncodedActionTable15 {
         sb.append("\023");
         sb.append("\037");
         sb.append("\024");
-        sb.append("\u055b");
+        sb.append("\u055c");
         sb.append("\025");
         sb.append("\125");
         sb.append("\027");
@@ -769,7 +777,7 @@ public class EncodedActionTable15 {
         sb.append("\000");
         sb.append("\004");
         sb.append("\151");
-        sb.append("\u055c");
+        sb.append("\u055d");
         sb.append("\001");
         sb.append("\002");
         sb.append("\000");
@@ -1181,7 +1189,7 @@ public class EncodedActionTable15 {
         sb.append("\203");
         sb.append("\ufd8e");
         sb.append("\231");
-        sb.append("\u0561");
+        sb.append("\u0562");
         sb.append("\242");
         sb.append("\ufd90");
         sb.append("\243");
@@ -1249,7 +1257,7 @@ public class EncodedActionTable15 {
         sb.append("\201");
         sb.append("\ufd98");
         sb.append("\231");
-        sb.append("\u0560");
+        sb.append("\u0561");
         sb.append("\242");
         sb.append("\ufd98");
         sb.append("\245");
@@ -1505,13 +1513,13 @@ public class EncodedActionTable15 {
         sb.append("\215");
         sb.append("\uff9a");
         sb.append("\230");
-        sb.append("\u056a");
+        sb.append("\u056b");
         sb.append("\001");
         sb.append("\002");
         sb.append("\000");
         sb.append("\006");
         sb.append("\127");
-        sb.append("\u0566");
+        sb.append("\u0567");
         sb.append("\215");
         sb.append("\ufdac");
         sb.append("\001");
@@ -1535,7 +1543,7 @@ public class EncodedActionTable15 {
         sb.append("\000");
         sb.append("\004");
         sb.append("\215");
-        sb.append("\u0568");
+        sb.append("\u0569");
         sb.append("\001");
         sb.append("\002");
         sb.append("\000");
@@ -1729,7 +1737,7 @@ public class EncodedActionTable15 {
         sb.append("\000");
         sb.append("\004");
         sb.append("\231");
-        sb.append("\u056c");
+        sb.append("\u056d");
         sb.append("\001");
         sb.append("\002");
         sb.append("\000");
@@ -1821,9 +1829,9 @@ public class EncodedActionTable15 {
         sb.append("\000");
         sb.append("\012");
         sb.append("\033");
-        sb.append("\u0593");
+        sb.append("\u0594");
         sb.append("\117");
-        sb.append("\u0592");
+        sb.append("\u0593");
         sb.append("\127");
         sb.append("\uff91");
         sb.append("\151");
@@ -1835,7 +1843,7 @@ public class EncodedActionTable15 {
         sb.append("\010");
         sb.append("\325");
         sb.append("\117");
-        sb.append("\u0572");
+        sb.append("\u0573");
         sb.append("\121");
         sb.append("\070");
         sb.append("\001");
@@ -1853,7 +1861,7 @@ public class EncodedActionTable15 {
         sb.append("\010");
         sb.append("\325");
         sb.append("\117");
-        sb.append("\u0572");
+        sb.append("\u0573");
         sb.append("\121");
         sb.append("\070");
         sb.append("\001");
@@ -1869,9 +1877,9 @@ public class EncodedActionTable15 {
         sb.append("\000");
         sb.append("\006");
         sb.append("\127");
-        sb.append("\u0574");
-        sb.append("\151");
         sb.append("\u0575");
+        sb.append("\151");
+        sb.append("\u0576");
         sb.append("\001");
         sb.append("\002");
         sb.append("\000");
@@ -1879,7 +1887,7 @@ public class EncodedActionTable15 {
         sb.append("\010");
         sb.append("\325");
         sb.append("\117");
-        sb.append("\u0572");
+        sb.append("\u0573");
         sb.append("\121");
         sb.append("\070");
         sb.append("\001");
@@ -2079,9 +2087,9 @@ public class EncodedActionTable15 {
         sb.append("\000");
         sb.append("\012");
         sb.append("\033");
-        sb.append("\u0579");
+        sb.append("\u057a");
         sb.append("\117");
-        sb.append("\u0578");
+        sb.append("\u0579");
         sb.append("\127");
         sb.append("\uff8e");
         sb.append("\151");
@@ -2093,13 +2101,13 @@ public class EncodedActionTable15 {
         sb.append("\010");
         sb.append("\334");
         sb.append("\111");
-        sb.append("\u057b");
+        sb.append("\u057c");
         sb.append("\001");
         sb.append("\002");
         sb.append("\000");
         sb.append("\004");
         sb.append("\010");
-        sb.append("\u057a");
+        sb.append("\u057b");
         sb.append("\001");
         sb.append("\002");
         sb.append("\000");
@@ -2115,9 +2123,9 @@ public class EncodedActionTable15 {
         sb.append("\010");
         sb.append("\325");
         sb.append("\045");
-        sb.append("\u057d");
-        sb.append("\046");
         sb.append("\u057e");
+        sb.append("\046");
+        sb.append("\u057f");
         sb.append("\112");
         sb.append("\uff8a");
         sb.append("\121");
@@ -2153,19 +2161,19 @@ public class EncodedActionTable15 {
         sb.append("\112");
         sb.append("\ufdac");
         sb.append("\127");
-        sb.append("\u0585");
+        sb.append("\u0586");
         sb.append("\001");
         sb.append("\002");
         sb.append("\000");
         sb.append("\004");
         sb.append("\112");
-        sb.append("\u0584");
+        sb.append("\u0585");
         sb.append("\001");
         sb.append("\002");
         sb.append("\000");
         sb.append("\012");
         sb.append("\033");
-        sb.append("\u0582");
+        sb.append("\u0583");
         sb.append("\112");
         sb.append("\uff87");
         sb.append("\117");
@@ -2177,7 +2185,7 @@ public class EncodedActionTable15 {
         sb.append("\000");
         sb.append("\004");
         sb.append("\010");
-        sb.append("\u0583");
+        sb.append("\u0584");
         sb.append("\001");
         sb.append("\002");
         sb.append("\000");
@@ -2201,9 +2209,9 @@ public class EncodedActionTable15 {
         sb.append("\010");
         sb.append("\325");
         sb.append("\045");
-        sb.append("\u057d");
-        sb.append("\046");
         sb.append("\u057e");
+        sb.append("\046");
+        sb.append("\u057f");
         sb.append("\112");
         sb.append("\ufdab");
         sb.append("\121");
@@ -2227,7 +2235,7 @@ public class EncodedActionTable15 {
         sb.append("\000");
         sb.append("\012");
         sb.append("\033");
-        sb.append("\u0589");
+        sb.append("\u058a");
         sb.append("\112");
         sb.append("\uff83");
         sb.append("\117");
@@ -2239,7 +2247,7 @@ public class EncodedActionTable15 {
         sb.append("\000");
         sb.append("\004");
         sb.append("\010");
-        sb.append("\u058a");
+        sb.append("\u058b");
         sb.append("\001");
         sb.append("\002");
         sb.append("\000");
@@ -2253,7 +2261,7 @@ public class EncodedActionTable15 {
         sb.append("\000");
         sb.append("\012");
         sb.append("\033");
-        sb.append("\u058c");
+        sb.append("\u058d");
         sb.append("\112");
         sb.append("\uff85");
         sb.append("\117");
@@ -2265,7 +2273,7 @@ public class EncodedActionTable15 {
         sb.append("\000");
         sb.append("\004");
         sb.append("\010");
-        sb.append("\u058d");
+        sb.append("\u058e");
         sb.append("\001");
         sb.append("\002");
         sb.append("\000");
@@ -2279,9 +2287,9 @@ public class EncodedActionTable15 {
         sb.append("\000");
         sb.append("\006");
         sb.append("\127");
-        sb.append("\u0574");
+        sb.append("\u0575");
         sb.append("\151");
-        sb.append("\u058f");
+        sb.append("\u0590");
         sb.append("\001");
         sb.append("\002");
         sb.append("\000");
@@ -2471,9 +2479,9 @@ public class EncodedActionTable15 {
         sb.append("\000");
         sb.append("\006");
         sb.append("\127");
-        sb.append("\u0574");
+        sb.append("\u0575");
         sb.append("\151");
-        sb.append("\u0591");
+        sb.append("\u0592");
         sb.append("\001");
         sb.append("\002");
         sb.append("\000");
@@ -2665,13 +2673,13 @@ public class EncodedActionTable15 {
         sb.append("\010");
         sb.append("\334");
         sb.append("\111");
-        sb.append("\u0595");
+        sb.append("\u0596");
         sb.append("\001");
         sb.append("\002");
         sb.append("\000");
         sb.append("\004");
         sb.append("\010");
-        sb.append("\u0594");
+        sb.append("\u0595");
         sb.append("\001");
         sb.append("\002");
         sb.append("\000");
@@ -2687,9 +2695,9 @@ public class EncodedActionTable15 {
         sb.append("\010");
         sb.append("\325");
         sb.append("\045");
-        sb.append("\u057d");
-        sb.append("\046");
         sb.append("\u057e");
+        sb.append("\046");
+        sb.append("\u057f");
         sb.append("\112");
         sb.append("\uff8a");
         sb.append("\121");
@@ -2699,7 +2707,7 @@ public class EncodedActionTable15 {
         sb.append("\000");
         sb.append("\004");
         sb.append("\112");
-        sb.append("\u0597");
+        sb.append("\u0598");
         sb.append("\001");
         sb.append("\002");
         sb.append("\000");
@@ -2827,7 +2835,7 @@ public class EncodedActionTable15 {
         sb.append("\063");
         sb.append("\034");
         sb.append("\074");
-        sb.append("\u0358");
+        sb.append("\u0359");
         sb.append("\075");
         sb.append("\015");
         sb.append("\077");
@@ -2869,7 +2877,7 @@ public class EncodedActionTable15 {
         sb.append("\133");
         sb.append("\100");
         sb.append("\156");
-        sb.append("\u0351");
+        sb.append("\u0352");
         sb.append("\172");
         sb.append("\130");
         sb.append("\173");
@@ -2917,7 +2925,7 @@ public class EncodedActionTable15 {
         sb.append("\236");
         sb.append("\152");
         sb.append("\244");
-        sb.append("\u0357");
+        sb.append("\u0358");
         sb.append("\247");
         sb.append("\032");
         sb.append("\001");
@@ -2925,7 +2933,7 @@ public class EncodedActionTable15 {
         sb.append("\000");
         sb.append("\004");
         sb.append("\231");
-        sb.append("\u059c");
+        sb.append("\u059d");
         sb.append("\001");
         sb.append("\002");
         sb.append("\000");
@@ -3189,7 +3197,7 @@ public class EncodedActionTable15 {
         sb.append("\201");
         sb.append("\251");
         sb.append("\231");
-        sb.append("\u059f");
+        sb.append("\u05a0");
         sb.append("\242");
         sb.append("\253");
         sb.append("\245");
@@ -3199,13 +3207,13 @@ public class EncodedActionTable15 {
         sb.append("\000");
         sb.append("\004");
         sb.append("\111");
-        sb.append("\u05a0");
+        sb.append("\u05a1");
         sb.append("\001");
         sb.append("\002");
         sb.append("\000");
         sb.append("\174");
         sb.append("\003");
-        sb.append("\u05a6");
+        sb.append("\u05a7");
         sb.append("\004");
         sb.append("\204");
         sb.append("\006");
@@ -3227,7 +3235,7 @@ public class EncodedActionTable15 {
         sb.append("\036");
         sb.append("\014");
         sb.append("\040");
-        sb.append("\u05a4");
+        sb.append("\u05a5");
         sb.append("\044");
         sb.append("\077");
         sb.append("\045");
@@ -3401,13 +3409,13 @@ public class EncodedActionTable15 {
         sb.append("\073");
         sb.append("\ufdac");
         sb.append("\127");
-        sb.append("\u05b1");
+        sb.append("\u05b2");
         sb.append("\001");
         sb.append("\002");
         sb.append("\000");
         sb.append("\004");
         sb.append("\112");
-        sb.append("\u05b0");
+        sb.append("\u05b1");
         sb.append("\001");
         sb.append("\002");
         sb.append("\000");
@@ -3415,7 +3423,7 @@ public class EncodedActionTable15 {
         sb.append("\073");
         sb.append("\ufdac");
         sb.append("\127");
-        sb.append("\u05ac");
+        sb.append("\u05ad");
         sb.append("\001");
         sb.append("\002");
         sb.append("\000");
@@ -3423,7 +3431,7 @@ public class EncodedActionTable15 {
         sb.append("\112");
         sb.append("\ufdac");
         sb.append("\127");
-        sb.append("\u05a9");
+        sb.append("\u05aa");
         sb.append("\001");
         sb.append("\002");
         sb.append("\000");
@@ -3455,7 +3463,7 @@ public class EncodedActionTable15 {
         sb.append("\000");
         sb.append("\174");
         sb.append("\003");
-        sb.append("\u05a6");
+        sb.append("\u05a7");
         sb.append("\004");
         sb.append("\204");
         sb.append("\006");
@@ -3477,7 +3485,7 @@ public class EncodedActionTable15 {
         sb.append("\036");
         sb.append("\014");
         sb.append("\040");
-        sb.append("\u05a4");
+        sb.append("\u05a5");
         sb.append("\044");
         sb.append("\077");
         sb.append("\045");
@@ -3601,13 +3609,13 @@ public class EncodedActionTable15 {
         sb.append("\000");
         sb.append("\004");
         sb.append("\073");
-        sb.append("\u05ae");
+        sb.append("\u05af");
         sb.append("\001");
         sb.append("\002");
         sb.append("\000");
         sb.append("\170");
         sb.append("\003");
-        sb.append("\u05a6");
+        sb.append("\u05a7");
         sb.append("\004");
         sb.append("\204");
         sb.append("\006");
@@ -3815,7 +3823,7 @@ public class EncodedActionTable15 {
         sb.append("\000");
         sb.append("\172");
         sb.append("\003");
-        sb.append("\u05a6");
+        sb.append("\u05a7");
         sb.append("\004");
         sb.append("\204");
         sb.append("\006");
@@ -3939,13 +3947,13 @@ public class EncodedActionTable15 {
         sb.append("\000");
         sb.append("\004");
         sb.append("\073");
-        sb.append("\u05b3");
+        sb.append("\u05b4");
         sb.append("\001");
         sb.append("\002");
         sb.append("\000");
         sb.append("\170");
         sb.append("\003");
-        sb.append("\u05a6");
+        sb.append("\u05a7");
         sb.append("\004");
         sb.append("\204");
         sb.append("\006");
@@ -4087,7 +4095,7 @@ public class EncodedActionTable15 {
         sb.append("\033");
         sb.append("\ufda0");
         sb.append("\073");
-        sb.append("\u05b9");
+        sb.append("\u05ba");
         sb.append("\112");
         sb.append("\ufda0");
         sb.append("\127");
@@ -4515,17 +4523,9 @@ public class EncodedActionTable15 {
         sb.append("\000");
         sb.append("\006");
         sb.append("\127");
-        sb.append("\u05c4");
-        sb.append("\151");
         sb.append("\u05c5");
-        sb.append("\001");
-        sb.append("\002");
-        sb.append("\000");
-        sb.append("\006");
-        sb.append("\127");
-        sb.append("\ufedd");
         sb.append("\151");
-        sb.append("\ufedd");
+        sb.append("\u05c6");
         sb.append("\001");
         sb.append("\002");
     }
diff --git a/php/php.editor/src/org/netbeans/modules/php/editor/parser/EncodedActionTable16.java b/php/php.editor/src/org/netbeans/modules/php/editor/parser/EncodedActionTable16.java
index 72899b2..ee61d65 100644
--- a/php/php.editor/src/org/netbeans/modules/php/editor/parser/EncodedActionTable16.java
+++ b/php/php.editor/src/org/netbeans/modules/php/editor/parser/EncodedActionTable16.java
@@ -29,6 +29,14 @@ public class EncodedActionTable16 {
     protected EncodedActionTable16() {
         sb = new StringBuilder();
         sb.append("\000");
+        sb.append("\006");
+        sb.append("\127");
+        sb.append("\ufedd");
+        sb.append("\151");
+        sb.append("\ufedd");
+        sb.append("\001");
+        sb.append("\002");
+        sb.append("\000");
         sb.append("\032");
         sb.append("\010");
         sb.append("\325");
@@ -39,7 +47,7 @@ public class EncodedActionTable16 {
         sb.append("\075");
         sb.append("\015");
         sb.append("\111");
-        sb.append("\u05c1");
+        sb.append("\u05c2");
         sb.append("\114");
         sb.append("\u0113");
         sb.append("\117");
@@ -205,7 +213,7 @@ public class EncodedActionTable16 {
         sb.append("\031");
         sb.append("\270");
         sb.append("\112");
-        sb.append("\u05c3");
+        sb.append("\u05c4");
         sb.append("\130");
         sb.append("\257");
         sb.append("\131");
@@ -275,9 +283,9 @@ public class EncodedActionTable16 {
         sb.append("\000");
         sb.append("\006");
         sb.append("\012");
-        sb.append("\u05bc");
-        sb.append("\233");
         sb.append("\u05bd");
+        sb.append("\233");
+        sb.append("\u05be");
         sb.append("\001");
         sb.append("\002");
         sb.append("\000");
@@ -623,7 +631,7 @@ public class EncodedActionTable16 {
         sb.append("\000");
         sb.append("\004");
         sb.append("\231");
-        sb.append("\u05c9");
+        sb.append("\u05ca");
         sb.append("\001");
         sb.append("\002");
         sb.append("\000");
diff --git a/php/php.editor/src/org/netbeans/modules/php/editor/parser/EncodedActionTable5.java b/php/php.editor/src/org/netbeans/modules/php/editor/parser/EncodedActionTable5.java
index b5ee16b..6a0fc85 100644
--- a/php/php.editor/src/org/netbeans/modules/php/editor/parser/EncodedActionTable5.java
+++ b/php/php.editor/src/org/netbeans/modules/php/editor/parser/EncodedActionTable5.java
@@ -2095,7 +2095,7 @@ public class EncodedActionTable5 {
         sb.append("\000");
         sb.append("\006");
         sb.append("\127");
-        sb.append("\u0337");
+        sb.append("\u0338");
         sb.append("\231");
         sb.append("\ufdac");
         sb.append("\001");
@@ -2203,9 +2203,9 @@ public class EncodedActionTable5 {
         sb.append("\121");
         sb.append("\070");
         sb.append("\150");
-        sb.append("\u0327");
+        sb.append("\u0328");
         sb.append("\222");
-        sb.append("\u0326");
+        sb.append("\u0327");
         sb.append("\001");
         sb.append("\002");
         sb.append("\000");
@@ -2833,9 +2833,9 @@ public class EncodedActionTable5 {
         sb.append("\000");
         sb.append("\006");
         sb.append("\016");
-        sb.append("\u0321");
+        sb.append("\u0322");
         sb.append("\230");
-        sb.append("\u0320");
+        sb.append("\u0321");
         sb.append("\001");
         sb.append("\002");
         sb.append("\000");
@@ -4107,15 +4107,15 @@ public class EncodedActionTable5 {
         sb.append("\000");
         sb.append("\004");
         sb.append("\012");
-        sb.append("\u0315");
+        sb.append("\u0316");
         sb.append("\001");
         sb.append("\002");
         sb.append("\000");
         sb.append("\006");
         sb.append("\127");
-        sb.append("\u0311");
-        sb.append("\231");
         sb.append("\u0310");
+        sb.append("\231");
+        sb.append("\ufdac");
         sb.append("\001");
         sb.append("\002");
         sb.append("\000");
@@ -4127,6 +4127,22 @@ public class EncodedActionTable5 {
         sb.append("\001");
         sb.append("\002");
         sb.append("\000");
+        sb.append("\010");
+        sb.append("\012");
+        sb.append("\u0314");
+        sb.append("\156");
+        sb.append("\u0313");
+        sb.append("\231");
+        sb.append("\ufdab");
+        sb.append("\001");
+        sb.append("\002");
+        sb.append("\000");
+        sb.append("\004");
+        sb.append("\231");
+        sb.append("\u0312");
+        sb.append("\001");
+        sb.append("\002");
+        sb.append("\000");
         sb.append("\006");
         sb.append("\111");
         sb.append("\ufe2d");
@@ -4135,17 +4151,9 @@ public class EncodedActionTable5 {
         sb.append("\001");
         sb.append("\002");
         sb.append("\000");
-        sb.append("\006");
-        sb.append("\012");
-        sb.append("\u0313");
-        sb.append("\156");
-        sb.append("\u0312");
-        sb.append("\001");
-        sb.append("\002");
-        sb.append("\000");
         sb.append("\004");
         sb.append("\012");
-        sb.append("\u0314");
+        sb.append("\u0315");
         sb.append("\001");
         sb.append("\002");
         sb.append("\000");
@@ -4175,7 +4183,7 @@ public class EncodedActionTable5 {
         sb.append("\000");
         sb.append("\004");
         sb.append("\230");
-        sb.append("\u0317");
+        sb.append("\u0318");
         sb.append("\001");
         sb.append("\002");
         sb.append("\000");
@@ -4215,7 +4223,7 @@ public class EncodedActionTable5 {
         sb.append("\000");
         sb.append("\004");
         sb.append("\231");
-        sb.append("\u0319");
+        sb.append("\u031a");
         sb.append("\001");
         sb.append("\002");
         sb.append("\000");
@@ -4229,13 +4237,13 @@ public class EncodedActionTable5 {
         sb.append("\000");
         sb.append("\004");
         sb.append("\073");
-        sb.append("\u031b");
+        sb.append("\u031c");
         sb.append("\001");
         sb.append("\002");
         sb.append("\000");
         sb.append("\174");
         sb.append("\003");
-        sb.append("\u031e");
+        sb.append("\u031f");
         sb.append("\004");
         sb.append("\204");
         sb.append("\006");
@@ -4520,13 +4528,5 @@ public class EncodedActionTable5 {
         sb.append("\ufd91");
         sb.append("\033");
         sb.append("\ufd91");
-        sb.append("\073");
-        sb.append("\ufd91");
-        sb.append("\112");
-        sb.append("\ufd91");
-        sb.append("\127");
-        sb.append("\ufd91");
-        sb.append("\130");
-        sb.append("\ufd91");
     }
 }
\ No newline at end of file
diff --git a/php/php.editor/src/org/netbeans/modules/php/editor/parser/EncodedActionTable6.java b/php/php.editor/src/org/netbeans/modules/php/editor/parser/EncodedActionTable6.java
index c661ae8..0de5110 100644
--- a/php/php.editor/src/org/netbeans/modules/php/editor/parser/EncodedActionTable6.java
+++ b/php/php.editor/src/org/netbeans/modules/php/editor/parser/EncodedActionTable6.java
@@ -28,6 +28,14 @@ public class EncodedActionTable6 {
     }
     protected EncodedActionTable6() {
         sb = new StringBuilder();
+        sb.append("\073");
+        sb.append("\ufd91");
+        sb.append("\112");
+        sb.append("\ufd91");
+        sb.append("\127");
+        sb.append("\ufd91");
+        sb.append("\130");
+        sb.append("\ufd91");
         sb.append("\131");
         sb.append("\ufd91");
         sb.append("\132");
@@ -95,13 +103,13 @@ public class EncodedActionTable6 {
         sb.append("\000");
         sb.append("\004");
         sb.append("\151");
-        sb.append("\u0324");
+        sb.append("\u0325");
         sb.append("\001");
         sb.append("\002");
         sb.append("\000");
         sb.append("\004");
         sb.append("\016");
-        sb.append("\u0322");
+        sb.append("\u0323");
         sb.append("\001");
         sb.append("\002");
         sb.append("\000");
@@ -113,7 +121,7 @@ public class EncodedActionTable6 {
         sb.append("\000");
         sb.append("\004");
         sb.append("\231");
-        sb.append("\u0323");
+        sb.append("\u0324");
         sb.append("\001");
         sb.append("\002");
         sb.append("\000");
@@ -335,7 +343,7 @@ public class EncodedActionTable6 {
         sb.append("\151");
         sb.append("\ufef6");
         sb.append("\154");
-        sb.append("\u032e");
+        sb.append("\u032f");
         sb.append("\001");
         sb.append("\002");
         sb.append("\000");
@@ -365,7 +373,7 @@ public class EncodedActionTable6 {
         sb.append("\121");
         sb.append("\070");
         sb.append("\222");
-        sb.append("\u0326");
+        sb.append("\u0327");
         sb.append("\001");
         sb.append("\002");
         sb.append("\000");
@@ -399,7 +407,7 @@ public class EncodedActionTable6 {
         sb.append("\151");
         sb.append("\ufef8");
         sb.append("\154");
-        sb.append("\u032b");
+        sb.append("\u032c");
         sb.append("\001");
         sb.append("\002");
         sb.append("\000");
@@ -417,7 +425,7 @@ public class EncodedActionTable6 {
         sb.append("\121");
         sb.append("\070");
         sb.append("\222");
-        sb.append("\u0326");
+        sb.append("\u0327");
         sb.append("\001");
         sb.append("\002");
         sb.append("\000");
@@ -457,7 +465,7 @@ public class EncodedActionTable6 {
         sb.append("\121");
         sb.append("\070");
         sb.append("\222");
-        sb.append("\u0326");
+        sb.append("\u0327");
         sb.append("\001");
         sb.append("\002");
         sb.append("\000");
@@ -493,7 +501,7 @@ public class EncodedActionTable6 {
         sb.append("\000");
         sb.append("\004");
         sb.append("\012");
-        sb.append("\u0333");
+        sb.append("\u0334");
         sb.append("\001");
         sb.append("\002");
         sb.append("\000");
@@ -501,7 +509,7 @@ public class EncodedActionTable6 {
         sb.append("\127");
         sb.append("\ufefe");
         sb.append("\134");
-        sb.append("\u0334");
+        sb.append("\u0335");
         sb.append("\231");
         sb.append("\ufefe");
         sb.append("\001");
@@ -667,7 +675,7 @@ public class EncodedActionTable6 {
         sb.append("\000");
         sb.append("\004");
         sb.append("\111");
-        sb.append("\u033f");
+        sb.append("\u0340");
         sb.append("\001");
         sb.append("\002");
         sb.append("\000");
@@ -711,7 +719,7 @@ public class EncodedActionTable6 {
         sb.append("\060");
         sb.append("\u0289");
         sb.append("\112");
-        sb.append("\u0341");
+        sb.append("\u0342");
         sb.append("\120");
         sb.append("\u0283");
         sb.append("\222");
@@ -1099,9 +1107,9 @@ public class EncodedActionTable6 {
         sb.append("\033");
         sb.append("\ufe0b");
         sb.append("\071");
-        sb.append("\u034a");
+        sb.append("\u034b");
         sb.append("\072");
-        sb.append("\u0348");
+        sb.append("\u0349");
         sb.append("\073");
         sb.append("\ufe0b");
         sb.append("\112");
@@ -1547,9 +1555,9 @@ public class EncodedActionTable6 {
         sb.append("\033");
         sb.append("\ufe0a");
         sb.append("\071");
-        sb.append("\u034a");
+        sb.append("\u034b");
         sb.append("\072");
-        sb.append("\u0348");
+        sb.append("\u0349");
         sb.append("\073");
         sb.append("\ufe0a");
         sb.append("\112");
@@ -1747,7 +1755,7 @@ public class EncodedActionTable6 {
         sb.append("\031");
         sb.append("\270");
         sb.append("\073");
-        sb.append("\u0362");
+        sb.append("\u0363");
         sb.append("\127");
         sb.append("\ufd43");
         sb.append("\130");
@@ -1825,7 +1833,7 @@ public class EncodedActionTable6 {
         sb.append("\000");
         sb.append("\010");
         sb.append("\127");
-        sb.append("\u0360");
+        sb.append("\u0361");
         sb.append("\215");
         sb.append("\ufd49");
         sb.append("\231");
@@ -1845,7 +1853,7 @@ public class EncodedActionTable6 {
         sb.append("\000");
         sb.append("\004");
         sb.append("\215");
-        sb.append("\u035f");
+        sb.append("\u0360");
         sb.append("\001");
         sb.append("\002");
         sb.append("\000");
@@ -1971,7 +1979,7 @@ public class EncodedActionTable6 {
         sb.append("\000");
         sb.append("\004");
         sb.append("\230");
-        sb.append("\u0359");
+        sb.append("\u035a");
         sb.append("\001");
         sb.append("\002");
         sb.append("\000");
@@ -2007,7 +2015,7 @@ public class EncodedActionTable6 {
         sb.append("\063");
         sb.append("\034");
         sb.append("\074");
-        sb.append("\u0358");
+        sb.append("\u0359");
         sb.append("\075");
         sb.append("\015");
         sb.append("\077");
@@ -2049,7 +2057,7 @@ public class EncodedActionTable6 {
         sb.append("\133");
         sb.append("\100");
         sb.append("\156");
-        sb.append("\u0351");
+        sb.append("\u0352");
         sb.append("\172");
         sb.append("\130");
         sb.append("\173");
@@ -2097,7 +2105,7 @@ public class EncodedActionTable6 {
         sb.append("\236");
         sb.append("\152");
         sb.append("\244");
-        sb.append("\u0357");
+        sb.append("\u0358");
         sb.append("\247");
         sb.append("\032");
         sb.append("\001");
@@ -2105,7 +2113,7 @@ public class EncodedActionTable6 {
         sb.append("\000");
         sb.append("\004");
         sb.append("\231");
-        sb.append("\u035b");
+        sb.append("\u035c");
         sb.append("\001");
         sb.append("\002");
         sb.append("\000");
@@ -2113,7 +2121,7 @@ public class EncodedActionTable6 {
         sb.append("\127");
         sb.append("\ufd3e");
         sb.append("\134");
-        sb.append("\u035c");
+        sb.append("\u035d");
         sb.append("\215");
         sb.append("\ufd3e");
         sb.append("\231");
@@ -2429,7 +2437,7 @@ public class EncodedActionTable6 {
         sb.append("\063");
         sb.append("\034");
         sb.append("\074");
-        sb.append("\u0358");
+        sb.append("\u0359");
         sb.append("\075");
         sb.append("\015");
         sb.append("\077");
@@ -2471,7 +2479,7 @@ public class EncodedActionTable6 {
         sb.append("\133");
         sb.append("\100");
         sb.append("\156");
-        sb.append("\u0351");
+        sb.append("\u0352");
         sb.append("\172");
         sb.append("\130");
         sb.append("\173");
@@ -2521,7 +2529,7 @@ public class EncodedActionTable6 {
         sb.append("\236");
         sb.append("\152");
         sb.append("\244");
-        sb.append("\u0357");
+        sb.append("\u0358");
         sb.append("\247");
         sb.append("\032");
         sb.append("\001");
@@ -2569,7 +2577,7 @@ public class EncodedActionTable6 {
         sb.append("\063");
         sb.append("\034");
         sb.append("\074");
-        sb.append("\u0365");
+        sb.append("\u0366");
         sb.append("\075");
         sb.append("\015");
         sb.append("\077");
@@ -2609,7 +2617,7 @@ public class EncodedActionTable6 {
         sb.append("\133");
         sb.append("\100");
         sb.append("\156");
-        sb.append("\u0363");
+        sb.append("\u0364");
         sb.append("\172");
         sb.append("\130");
         sb.append("\173");
@@ -2755,7 +2763,7 @@ public class EncodedActionTable6 {
         sb.append("\000");
         sb.append("\004");
         sb.append("\230");
-        sb.append("\u0366");
+        sb.append("\u0367");
         sb.append("\001");
         sb.append("\002");
         sb.append("\000");
@@ -2791,7 +2799,7 @@ public class EncodedActionTable6 {
         sb.append("\063");
         sb.append("\034");
         sb.append("\074");
-        sb.append("\u0358");
+        sb.append("\u0359");
         sb.append("\075");
         sb.append("\015");
         sb.append("\077");
@@ -2833,7 +2841,7 @@ public class EncodedActionTable6 {
         sb.append("\133");
         sb.append("\100");
         sb.append("\156");
-        sb.append("\u0351");
+        sb.append("\u0352");
         sb.append("\172");
         sb.append("\130");
         sb.append("\173");
@@ -2881,7 +2889,7 @@ public class EncodedActionTable6 {
         sb.append("\236");
         sb.append("\152");
         sb.append("\244");
-        sb.append("\u0357");
+        sb.append("\u0358");
         sb.append("\247");
         sb.append("\032");
         sb.append("\001");
@@ -2889,7 +2897,7 @@ public class EncodedActionTable6 {
         sb.append("\000");
         sb.append("\004");
         sb.append("\231");
-        sb.append("\u0368");
+        sb.append("\u0369");
         sb.append("\001");
         sb.append("\002");
         sb.append("\000");
@@ -2897,7 +2905,7 @@ public class EncodedActionTable6 {
         sb.append("\127");
         sb.append("\ufd3f");
         sb.append("\134");
-        sb.append("\u035c");
+        sb.append("\u035d");
         sb.append("\215");
         sb.append("\ufd3f");
         sb.append("\231");
@@ -4179,7 +4187,7 @@ public class EncodedActionTable6 {
         sb.append("\201");
         sb.append("\251");
         sb.append("\232");
-        sb.append("\u037e");
+        sb.append("\u037f");
         sb.append("\242");
         sb.append("\253");
         sb.append("\245");
@@ -4520,13 +4528,5 @@ public class EncodedActionTable6 {
         sb.append("\257");
         sb.append("\131");
         sb.append("\300");
-        sb.append("\132");
-        sb.append("\246");
-        sb.append("\150");
-        sb.append("\252");
-        sb.append("\151");
-        sb.append("\ufe51");
-        sb.append("\152");
-        sb.append("\247");
     }
 }
\ No newline at end of file
diff --git a/php/php.editor/src/org/netbeans/modules/php/editor/parser/EncodedActionTable7.java b/php/php.editor/src/org/netbeans/modules/php/editor/parser/EncodedActionTable7.java
index c3bc01b..4ebc0cc 100644
--- a/php/php.editor/src/org/netbeans/modules/php/editor/parser/EncodedActionTable7.java
+++ b/php/php.editor/src/org/netbeans/modules/php/editor/parser/EncodedActionTable7.java
@@ -28,6 +28,14 @@ public class EncodedActionTable7 {
     }
     protected EncodedActionTable7() {
         sb = new StringBuilder();
+        sb.append("\132");
+        sb.append("\246");
+        sb.append("\150");
+        sb.append("\252");
+        sb.append("\151");
+        sb.append("\ufe51");
+        sb.append("\152");
+        sb.append("\247");
         sb.append("\153");
         sb.append("\271");
         sb.append("\154");
@@ -743,7 +751,7 @@ public class EncodedActionTable7 {
         sb.append("\201");
         sb.append("\ufe89");
         sb.append("\231");
-        sb.append("\u0389");
+        sb.append("\u038a");
         sb.append("\242");
         sb.append("\ufe89");
         sb.append("\245");
@@ -1201,7 +1209,7 @@ public class EncodedActionTable7 {
         sb.append("\000");
         sb.append("\004");
         sb.append("\230");
-        sb.append("\u038e");
+        sb.append("\u038f");
         sb.append("\001");
         sb.append("\002");
         sb.append("\000");
@@ -1241,7 +1249,7 @@ public class EncodedActionTable7 {
         sb.append("\000");
         sb.append("\004");
         sb.append("\231");
-        sb.append("\u0390");
+        sb.append("\u0391");
         sb.append("\001");
         sb.append("\002");
         sb.append("\000");
@@ -1265,7 +1273,7 @@ public class EncodedActionTable7 {
         sb.append("\000");
         sb.append("\004");
         sb.append("\111");
-        sb.append("\u0393");
+        sb.append("\u0394");
         sb.append("\001");
         sb.append("\002");
         sb.append("\000");
@@ -1543,7 +1551,7 @@ public class EncodedActionTable7 {
         sb.append("\111");
         sb.append("\101");
         sb.append("\112");
-        sb.append("\u0395");
+        sb.append("\u0396");
         sb.append("\114");
         sb.append("\226");
         sb.append("\115");
@@ -2035,7 +2043,7 @@ public class EncodedActionTable7 {
         sb.append("\230");
         sb.append("\212");
         sb.append("\232");
-        sb.append("\u039a");
+        sb.append("\u039b");
         sb.append("\233");
         sb.append("\124");
         sb.append("\234");
@@ -2613,9 +2621,9 @@ public class EncodedActionTable7 {
         sb.append("\217");
         sb.append("\uff09");
         sb.append("\220");
-        sb.append("\u039f");
+        sb.append("\u03a0");
         sb.append("\221");
-        sb.append("\u039e");
+        sb.append("\u039f");
         sb.append("\222");
         sb.append("\uff09");
         sb.append("\223");
@@ -3011,7 +3019,7 @@ public class EncodedActionTable7 {
         sb.append("\000");
         sb.append("\004");
         sb.append("\230");
-        sb.append("\u03a0");
+        sb.append("\u03a1");
         sb.append("\001");
         sb.append("\002");
         sb.append("\000");
@@ -3191,7 +3199,7 @@ public class EncodedActionTable7 {
         sb.append("\201");
         sb.append("\251");
         sb.append("\231");
-        sb.append("\u03a2");
+        sb.append("\u03a3");
         sb.append("\242");
         sb.append("\253");
         sb.append("\245");
@@ -3959,27 +3967,27 @@ public class EncodedActionTable7 {
         sb.append("\217");
         sb.append("\uff07");
         sb.append("\220");
-        sb.append("\u03a9");
+        sb.append("\u03aa");
         sb.append("\221");
-        sb.append("\u03a8");
+        sb.append("\u03a9");
         sb.append("\001");
         sb.append("\002");
         sb.append("\000");
         sb.append("\004");
         sb.append("\217");
-        sb.append("\u03b1");
+        sb.append("\u03b2");
         sb.append("\001");
         sb.append("\002");
         sb.append("\000");
         sb.append("\004");
         sb.append("\232");
-        sb.append("\u03af");
+        sb.append("\u03b0");
         sb.append("\001");
         sb.append("\002");
         sb.append("\000");
         sb.append("\004");
         sb.append("\230");
-        sb.append("\u03aa");
+        sb.append("\u03ab");
         sb.append("\001");
         sb.append("\002");
         sb.append("\000");
@@ -4159,7 +4167,7 @@ public class EncodedActionTable7 {
         sb.append("\201");
         sb.append("\251");
         sb.append("\231");
-        sb.append("\u03ac");
+        sb.append("\u03ad");
         sb.append("\242");
         sb.append("\253");
         sb.append("\245");
@@ -4169,7 +4177,7 @@ public class EncodedActionTable7 {
         sb.append("\000");
         sb.append("\004");
         sb.append("\232");
-        sb.append("\u03ad");
+        sb.append("\u03ae");
         sb.append("\001");
         sb.append("\002");
         sb.append("\000");
@@ -4520,13 +4528,5 @@ public class EncodedActionTable7 {
         sb.append("\076");
         sb.append("\224");
         sb.append("\020");
-        sb.append("\230");
-        sb.append("\212");
-        sb.append("\233");
-        sb.append("\124");
-        sb.append("\234");
-        sb.append("\140");
-        sb.append("\235");
-        sb.append("\073");
     }
 }
\ No newline at end of file
diff --git a/php/php.editor/src/org/netbeans/modules/php/editor/parser/EncodedActionTable8.java b/php/php.editor/src/org/netbeans/modules/php/editor/parser/EncodedActionTable8.java
index f40eca1..b3c08f0 100644
--- a/php/php.editor/src/org/netbeans/modules/php/editor/parser/EncodedActionTable8.java
+++ b/php/php.editor/src/org/netbeans/modules/php/editor/parser/EncodedActionTable8.java
@@ -28,6 +28,14 @@ public class EncodedActionTable8 {
     }
     protected EncodedActionTable8() {
         sb = new StringBuilder();
+        sb.append("\230");
+        sb.append("\212");
+        sb.append("\233");
+        sb.append("\124");
+        sb.append("\234");
+        sb.append("\140");
+        sb.append("\235");
+        sb.append("\073");
         sb.append("\236");
         sb.append("\152");
         sb.append("\240");
@@ -395,7 +403,7 @@ public class EncodedActionTable8 {
         sb.append("\000");
         sb.append("\004");
         sb.append("\151");
-        sb.append("\u03b2");
+        sb.append("\u03b3");
         sb.append("\001");
         sb.append("\002");
         sb.append("\000");
@@ -613,15 +621,15 @@ public class EncodedActionTable8 {
         sb.append("\000");
         sb.append("\006");
         sb.append("\127");
-        sb.append("\u03b9");
+        sb.append("\u03ba");
         sb.append("\231");
-        sb.append("\u03b8");
+        sb.append("\u03b9");
         sb.append("\001");
         sb.append("\002");
         sb.append("\000");
         sb.append("\004");
         sb.append("\134");
-        sb.append("\u03b6");
+        sb.append("\u03b7");
         sb.append("\001");
         sb.append("\002");
         sb.append("\000");
@@ -843,7 +851,7 @@ public class EncodedActionTable8 {
         sb.append("\230");
         sb.append("\212");
         sb.append("\232");
-        sb.append("\u03be");
+        sb.append("\u03bf");
         sb.append("\233");
         sb.append("\124");
         sb.append("\234");
@@ -867,7 +875,7 @@ public class EncodedActionTable8 {
         sb.append("\000");
         sb.append("\004");
         sb.append("\134");
-        sb.append("\u03bb");
+        sb.append("\u03bc");
         sb.append("\001");
         sb.append("\002");
         sb.append("\000");
@@ -1557,7 +1565,7 @@ public class EncodedActionTable8 {
         sb.append("\027");
         sb.append("\220");
         sb.append("\030");
-        sb.append("\u03c1");
+        sb.append("\u03c2");
         sb.append("\032");
         sb.append("\126");
         sb.append("\034");
@@ -1701,7 +1709,7 @@ public class EncodedActionTable8 {
         sb.append("\000");
         sb.append("\004");
         sb.append("\151");
-        sb.append("\u03c2");
+        sb.append("\u03c3");
         sb.append("\001");
         sb.append("\002");
         sb.append("\000");
@@ -2175,7 +2183,7 @@ public class EncodedActionTable8 {
         sb.append("\063");
         sb.append("\034");
         sb.append("\074");
-        sb.append("\u0358");
+        sb.append("\u0359");
         sb.append("\075");
         sb.append("\015");
         sb.append("\077");
@@ -2217,7 +2225,7 @@ public class EncodedActionTable8 {
         sb.append("\133");
         sb.append("\100");
         sb.append("\156");
-        sb.append("\u0351");
+        sb.append("\u0352");
         sb.append("\172");
         sb.append("\130");
         sb.append("\173");
@@ -2265,7 +2273,7 @@ public class EncodedActionTable8 {
         sb.append("\236");
         sb.append("\152");
         sb.append("\244");
-        sb.append("\u0357");
+        sb.append("\u0358");
         sb.append("\247");
         sb.append("\032");
         sb.append("\001");
@@ -2273,25 +2281,25 @@ public class EncodedActionTable8 {
         sb.append("\000");
         sb.append("\004");
         sb.append("\231");
-        sb.append("\u03c8");
+        sb.append("\u03c9");
         sb.append("\001");
         sb.append("\002");
         sb.append("\000");
         sb.append("\004");
         sb.append("\134");
-        sb.append("\u035c");
+        sb.append("\u035d");
         sb.append("\001");
         sb.append("\002");
         sb.append("\000");
         sb.append("\004");
         sb.append("\231");
-        sb.append("\u03cc");
+        sb.append("\u03cd");
         sb.append("\001");
         sb.append("\002");
         sb.append("\000");
         sb.append("\004");
         sb.append("\231");
-        sb.append("\u03cb");
+        sb.append("\u03cc");
         sb.append("\001");
         sb.append("\002");
         sb.append("\000");
@@ -2459,13 +2467,13 @@ public class EncodedActionTable8 {
         sb.append("\015");
         sb.append("\170");
         sb.append("\016");
-        sb.append("\u03d3");
+        sb.append("\u03d4");
         sb.append("\075");
         sb.append("\015");
         sb.append("\114");
-        sb.append("\u03d1");
+        sb.append("\u03d2");
         sb.append("\117");
-        sb.append("\u03cf");
+        sb.append("\u03d0");
         sb.append("\121");
         sb.append("\070");
         sb.append("\214");
@@ -2481,7 +2489,7 @@ public class EncodedActionTable8 {
         sb.append("\000");
         sb.append("\004");
         sb.append("\113");
-        sb.append("\u03eb");
+        sb.append("\u03ec");
         sb.append("\001");
         sb.append("\002");
         sb.append("\000");
@@ -2503,7 +2511,7 @@ public class EncodedActionTable8 {
         sb.append("\000");
         sb.append("\004");
         sb.append("\117");
-        sb.append("\u03e8");
+        sb.append("\u03e9");
         sb.append("\001");
         sb.append("\002");
         sb.append("\000");
@@ -2535,13 +2543,13 @@ public class EncodedActionTable8 {
         sb.append("\000");
         sb.append("\004");
         sb.append("\113");
-        sb.append("\u03dc");
+        sb.append("\u03dd");
         sb.append("\001");
         sb.append("\002");
         sb.append("\000");
         sb.append("\006");
         sb.append("\127");
-        sb.append("\u03d8");
+        sb.append("\u03d9");
         sb.append("\231");
         sb.append("\ufdac");
         sb.append("\001");
@@ -2569,13 +2577,13 @@ public class EncodedActionTable8 {
         sb.append("\015");
         sb.append("\170");
         sb.append("\016");
-        sb.append("\u03d3");
+        sb.append("\u03d4");
         sb.append("\075");
         sb.append("\015");
         sb.append("\114");
-        sb.append("\u03d1");
+        sb.append("\u03d2");
         sb.append("\117");
-        sb.append("\u03cf");
+        sb.append("\u03d0");
         sb.append("\121");
         sb.append("\070");
         sb.append("\214");
@@ -2593,7 +2601,7 @@ public class EncodedActionTable8 {
         sb.append("\000");
         sb.append("\004");
         sb.append("\231");
-        sb.append("\u03da");
+        sb.append("\u03db");
         sb.append("\001");
         sb.append("\002");
         sb.append("\000");
@@ -2689,7 +2697,7 @@ public class EncodedActionTable8 {
         sb.append("\005");
         sb.append("\u0198");
         sb.append("\010");
-        sb.append("\u03dd");
+        sb.append("\u03de");
         sb.append("\012");
         sb.append("\075");
         sb.append("\017");
@@ -2793,15 +2801,15 @@ public class EncodedActionTable8 {
         sb.append("\111");
         sb.append("\u024d");
         sb.append("\114");
-        sb.append("\u03e0");
+        sb.append("\u03e1");
         sb.append("\115");
         sb.append("\u0185");
         sb.append("\116");
         sb.append("\u015a");
         sb.append("\117");
-        sb.append("\u03df");
+        sb.append("\u03e0");
         sb.append("\121");
-        sb.append("\u03de");
+        sb.append("\u03df");
         sb.append("\122");
         sb.append("\u0153");
         sb.append("\123");
@@ -2883,7 +2891,7 @@ public class EncodedActionTable8 {
         sb.append("\000");
         sb.append("\006");
         sb.append("\117");
-        sb.append("\u03e4");
+        sb.append("\u03e5");
         sb.append("\230");
         sb.append("\uffc0");
         sb.append("\001");
@@ -3141,7 +3149,7 @@ public class EncodedActionTable8 {
         sb.append("\005");
         sb.append("\u0198");
         sb.append("\010");
-        sb.append("\u03dd");
+        sb.append("\u03de");
         sb.append("\012");
         sb.append("\075");
         sb.append("\017");
@@ -3245,15 +3253,15 @@ public class EncodedActionTable8 {
         sb.append("\111");
         sb.append("\u0239");
         sb.append("\114");
-        sb.append("\u03e0");
+        sb.append("\u03e1");
         sb.append("\115");
         sb.append("\u0185");
         sb.append("\116");
         sb.append("\u015a");
         sb.append("\117");
-        sb.append("\u03df");
+        sb.append("\u03e0");
         sb.append("\121");
-        sb.append("\u03de");
+        sb.append("\u03df");
         sb.append("\122");
         sb.append("\u0153");
         sb.append("\123");
@@ -3499,7 +3507,7 @@ public class EncodedActionTable8 {
         sb.append("\230");
         sb.append("\231");
         sb.append("\231");
-        sb.append("\u03f1");
+        sb.append("\u03f2");
         sb.append("\233");
         sb.append("\124");
         sb.append("\234");
@@ -3647,7 +3655,7 @@ public class EncodedActionTable8 {
         sb.append("\201");
         sb.append("\251");
         sb.append("\231");
-        sb.append("\u03f2");
+        sb.append("\u03f3");
         sb.append("\242");
         sb.append("\253");
         sb.append("\245");
@@ -4463,7 +4471,7 @@ public class EncodedActionTable8 {
         sb.append("\150");
         sb.append("\ufd90");
         sb.append("\151");
-        sb.append("\u03fe");
+        sb.append("\u03ff");
         sb.append("\152");
         sb.append("\ufd90");
         sb.append("\153");
@@ -4520,13 +4528,5 @@ public class EncodedActionTable8 {
         sb.append("\ufd90");
         sb.append("\246");
         sb.append("\374");
-        sb.append("\001");
-        sb.append("\002");
-        sb.append("\000");
-        sb.append("\076");
-        sb.append("\031");
-        sb.append("\ufd98");
-        sb.append("\130");
-        sb.append("\ufd98");
     }
 }
\ No newline at end of file
diff --git a/php/php.editor/src/org/netbeans/modules/php/editor/parser/EncodedActionTable9.java b/php/php.editor/src/org/netbeans/modules/php/editor/parser/EncodedActionTable9.java
index d018ad6..cc5a5db 100644
--- a/php/php.editor/src/org/netbeans/modules/php/editor/parser/EncodedActionTable9.java
+++ b/php/php.editor/src/org/netbeans/modules/php/editor/parser/EncodedActionTable9.java
@@ -28,6 +28,14 @@ public class EncodedActionTable9 {
     }
     protected EncodedActionTable9() {
         sb = new StringBuilder();
+        sb.append("\001");
+        sb.append("\002");
+        sb.append("\000");
+        sb.append("\076");
+        sb.append("\031");
+        sb.append("\ufd98");
+        sb.append("\130");
+        sb.append("\ufd98");
         sb.append("\131");
         sb.append("\ufd98");
         sb.append("\132");
@@ -35,7 +43,7 @@ public class EncodedActionTable9 {
         sb.append("\150");
         sb.append("\ufd98");
         sb.append("\151");
-        sb.append("\u03fd");
+        sb.append("\u03fe");
         sb.append("\152");
         sb.append("\ufd98");
         sb.append("\153");
@@ -89,7 +97,7 @@ public class EncodedActionTable9 {
         sb.append("\000");
         sb.append("\004");
         sb.append("\151");
-        sb.append("\u03fc");
+        sb.append("\u03fd");
         sb.append("\001");
         sb.append("\002");
         sb.append("\000");
@@ -201,7 +209,7 @@ public class EncodedActionTable9 {
         sb.append("\222");
         sb.append("\225");
         sb.append("\230");
-        sb.append("\u03fb");
+        sb.append("\u03fc");
         sb.append("\233");
         sb.append("\124");
         sb.append("\234");
@@ -829,7 +837,7 @@ public class EncodedActionTable9 {
         sb.append("\000");
         sb.append("\004");
         sb.append("\134");
-        sb.append("\u0400");
+        sb.append("\u0401");
         sb.append("\001");
         sb.append("\002");
         sb.append("\000");
@@ -1363,7 +1371,7 @@ public class EncodedActionTable9 {
         sb.append("\201");
         sb.append("\251");
         sb.append("\231");
-        sb.append("\u0407");
+        sb.append("\u0408");
         sb.append("\242");
         sb.append("\253");
         sb.append("\245");
@@ -1373,9 +1381,9 @@ public class EncodedActionTable9 {
         sb.append("\000");
         sb.append("\006");
         sb.append("\111");
-        sb.append("\u0409");
-        sb.append("\232");
         sb.append("\u040a");
+        sb.append("\232");
+        sb.append("\u040b");
         sb.append("\001");
         sb.append("\002");
         sb.append("\000");
@@ -1591,7 +1599,7 @@ public class EncodedActionTable9 {
         sb.append("\112");
         sb.append("\uff14");
         sb.append("\151");
-        sb.append("\u041c");
+        sb.append("\u041d");
         sb.append("\001");
         sb.append("\002");
         sb.append("\000");
@@ -1603,17 +1611,17 @@ public class EncodedActionTable9 {
         sb.append("\040");
         sb.append("\uff14");
         sb.append("\151");
-        sb.append("\u040c");
+        sb.append("\u040d");
         sb.append("\001");
         sb.append("\002");
         sb.append("\000");
         sb.append("\010");
         sb.append("\035");
-        sb.append("\u0419");
+        sb.append("\u041a");
         sb.append("\037");
-        sb.append("\u040f");
-        sb.append("\040");
         sb.append("\u0410");
+        sb.append("\040");
+        sb.append("\u0411");
         sb.append("\001");
         sb.append("\002");
         sb.append("\000");
@@ -1629,17 +1637,17 @@ public class EncodedActionTable9 {
         sb.append("\000");
         sb.append("\010");
         sb.append("\035");
-        sb.append("\u040e");
-        sb.append("\037");
         sb.append("\u040f");
-        sb.append("\040");
+        sb.append("\037");
         sb.append("\u0410");
+        sb.append("\040");
+        sb.append("\u0411");
         sb.append("\001");
         sb.append("\002");
         sb.append("\000");
         sb.append("\004");
         sb.append("\151");
-        sb.append("\u0418");
+        sb.append("\u0419");
         sb.append("\001");
         sb.append("\002");
         sb.append("\000");
@@ -1765,9 +1773,9 @@ public class EncodedActionTable9 {
         sb.append("\000");
         sb.append("\006");
         sb.append("\151");
-        sb.append("\u0413");
+        sb.append("\u0414");
         sb.append("\232");
-        sb.append("\u0412");
+        sb.append("\u0413");
         sb.append("\001");
         sb.append("\002");
         sb.append("\000");
@@ -2519,7 +2527,7 @@ public class EncodedActionTable9 {
         sb.append("\150");
         sb.append("\252");
         sb.append("\151");
-        sb.append("\u0413");
+        sb.append("\u0414");
         sb.append("\152");
         sb.append("\247");
         sb.append("\153");
@@ -2565,7 +2573,7 @@ public class EncodedActionTable9 {
         sb.append("\201");
         sb.append("\251");
         sb.append("\232");
-        sb.append("\u0412");
+        sb.append("\u0413");
         sb.append("\242");
         sb.append("\253");
         sb.append("\245");
@@ -3147,7 +3155,7 @@ public class EncodedActionTable9 {
         sb.append("\000");
         sb.append("\004");
         sb.append("\151");
-        sb.append("\u041a");
+        sb.append("\u041b");
         sb.append("\001");
         sb.append("\002");
         sb.append("\000");
@@ -3357,11 +3365,11 @@ public class EncodedActionTable9 {
         sb.append("\000");
         sb.append("\010");
         sb.append("\037");
-        sb.append("\u040f");
-        sb.append("\040");
         sb.append("\u0410");
+        sb.append("\040");
+        sb.append("\u0411");
         sb.append("\112");
-        sb.append("\u041f");
+        sb.append("\u0420");
         sb.append("\001");
         sb.append("\002");
         sb.append("\000");
@@ -3377,11 +3385,11 @@ public class EncodedActionTable9 {
         sb.append("\000");
         sb.append("\010");
         sb.append("\037");
-        sb.append("\u040f");
-        sb.append("\040");
         sb.append("\u0410");
+        sb.append("\040");
+        sb.append("\u0411");
         sb.append("\112");
-        sb.append("\u041e");
+        sb.append("\u041f");
         sb.append("\001");
         sb.append("\002");
         sb.append("\000");
@@ -3923,7 +3931,7 @@ public class EncodedActionTable9 {
         sb.append("\000");
         sb.append("\004");
         sb.append("\231");
-        sb.append("\u0422");
+        sb.append("\u0423");
         sb.append("\001");
         sb.append("\002");
         sb.append("\000");
@@ -4273,9 +4281,9 @@ public class EncodedActionTable9 {
         sb.append("\000");
         sb.append("\006");
         sb.append("\127");
-        sb.append("\u0427");
-        sb.append("\151");
         sb.append("\u0428");
+        sb.append("\151");
+        sb.append("\u0429");
         sb.append("\001");
         sb.append("\002");
         sb.append("\000");
@@ -4520,13 +4528,5 @@ public class EncodedActionTable9 {
         sb.append("\uff69");
         sb.append("\115");
         sb.append("\uff69");
-        sb.append("\116");
-        sb.append("\uff69");
-        sb.append("\117");
-        sb.append("\uff69");
-        sb.append("\120");
-        sb.append("\uff69");
-        sb.append("\121");
-        sb.append("\uff69");
     }
 }
\ No newline at end of file
diff --git a/php/php.editor/src/org/netbeans/modules/php/editor/verification/PHP80UnhandledError.java b/php/php.editor/src/org/netbeans/modules/php/editor/verification/PHP80UnhandledError.java
index b498461..2b34fa0 100644
--- a/php/php.editor/src/org/netbeans/modules/php/editor/verification/PHP80UnhandledError.java
+++ b/php/php.editor/src/org/netbeans/modules/php/editor/verification/PHP80UnhandledError.java
@@ -27,9 +27,7 @@ import org.netbeans.api.annotations.common.CheckForNull;
 import org.netbeans.api.lexer.Token;
 import org.netbeans.api.lexer.TokenSequence;
 import org.netbeans.api.lexer.TokenUtilities;
-import org.netbeans.editor.BaseDocument;
 import org.netbeans.modules.csl.api.Error;
-import org.netbeans.modules.csl.spi.GsfUtilities;
 import org.netbeans.modules.csl.spi.support.CancelSupport;
 import org.netbeans.modules.php.api.PhpVersion;
 import org.netbeans.modules.php.editor.CodeUtils;
@@ -90,7 +88,9 @@ public final class PHP80UnhandledError extends UnhandledErrorRule {
             if (CancelSupport.getDefault().isCancelled()) {
                 return;
             }
-            errors.addAll(checkVisitor.getErrors());
+            TokenSequence<PHPTokenId> ts = phpParseResult.getSnapshot().getTokenHierarchy().tokenSequence(PHPTokenId.language());
+            assert ts != null;
+            errors.addAll(checkVisitor.getErrors(ts));
         }
     }
 
@@ -103,15 +103,17 @@ public final class PHP80UnhandledError extends UnhandledErrorRule {
 
         private final List<VerificationError> errors = new ArrayList<>();
         private final FileObject fileObject;
-        private final List<FormalParameter> lastParams = new ArrayList<>();
+        private final List<ASTNode> lastParams = new ArrayList<>();
+        private final List<ASTNode> lastLexicalVariables = new ArrayList<>();
         private boolean isSameAsThrowStatement = false;
 
         public CheckVisitor(FileObject fileObject) {
             this.fileObject = fileObject;
         }
 
-        public Collection<VerificationError> getErrors() {
-            checkTrailingCommasInParameterList();
+        public Collection<VerificationError> getErrors(TokenSequence<PHPTokenId> ts) {
+            checkTrailingCommas(ts, lastParams);
+            checkTrailingCommas(ts, lastLexicalVariables);
             return Collections.unmodifiableCollection(errors);
         }
 
@@ -141,6 +143,7 @@ public final class PHP80UnhandledError extends UnhandledErrorRule {
             }
             addLastParam(node.getFormalParameters());
             checkStaticReturnType(node.getReturnType());
+            addLastLexicalVariable(node.getLexicalVariables());
             super.visit(node);
         }
 
@@ -252,51 +255,43 @@ public final class PHP80UnhandledError extends UnhandledErrorRule {
             }
         }
 
+        private void addLastLexicalVariable(List<Expression> lexicalVariables) {
+            if (!lexicalVariables.isEmpty()) {
+                lastLexicalVariables.add(lexicalVariables.get(lexicalVariables.size() - 1));
+            }
+        }
+
         private void checkNonCapturingCatches(CatchClause node) {
             if (node.getVariable() == null) {
                 createError(node);
             }
         }
 
-        private void checkTrailingCommasInParameterList() {
-            if (!lastParams.isEmpty()) {
-                BaseDocument document = GsfUtilities.getDocument(fileObject, true);
-                if (document == null) {
-                    return;
-                }
-                document.readLock();
+        private void checkTrailingCommas(TokenSequence<PHPTokenId> ts, List<ASTNode> nodes) {
+            if (!nodes.isEmpty()) {
                 try {
-                    TokenSequence<PHPTokenId> ts = LexUtilities.getPHPTokenSequence(document, 0);
-                    if (ts == null) {
-                        return;
-                    }
-                    checkTrailingCommasInParameterList(ts);
+                    nodes.forEach((node) -> {
+                        if (CancelSupport.getDefault().isCancelled()) {
+                            return;
+                        }
+
+                        // find a comma ","
+                        Token<? extends PHPTokenId> token = findNextToken(ts, node.getEndOffset());
+                        if (token != null
+                                && token.id() == PHPTokenId.PHP_TOKEN
+                                && TokenUtilities.textEquals(token.text(), ",")) { // NOI18N
+                            createError(node);
+                        }
+                    });
                 } finally {
-                    document.readUnlock();
-                    lastParams.clear();
+                    nodes.clear();
                 }
             }
         }
 
-        private void checkTrailingCommasInParameterList(TokenSequence<PHPTokenId> ts) {
-            lastParams.forEach((param) -> {
-                if (CancelSupport.getDefault().isCancelled()) {
-                    return;
-                }
-
-                // find a comma ","
-                Token<? extends PHPTokenId> token = findNextToken(ts, param);
-                if (token != null
-                        && token.id() == PHPTokenId.PHP_TOKEN
-                        && TokenUtilities.textEquals(token.text(), ",")) { // NOI18N
-                    createError(param);
-                }
-            });
-        }
-
         @CheckForNull
-        private Token<? extends PHPTokenId> findNextToken(TokenSequence<PHPTokenId> ts, FormalParameter parameter) {
-            ts.move(parameter.getEndOffset());
+        private Token<? extends PHPTokenId> findNextToken(TokenSequence<PHPTokenId> ts, int startOffset) {
+            ts.move(startOffset);
             if (!ts.moveNext()) {
                 return null;
             }
diff --git a/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/parser/ASTPHP5ParserTest/parser/php80/allowTrailingCommaInClosureUseLists_01.pass b/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/parser/ASTPHP5ParserTest/parser/php80/allowTrailingCommaInClosureUseLists_01.pass
new file mode 100644
index 0000000..42b4419
--- /dev/null
+++ b/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/parser/ASTPHP5ParserTest/parser/php80/allowTrailingCommaInClosureUseLists_01.pass
@@ -0,0 +1,573 @@
+<testresult testFile='allowTrailingCommaInClosureUseLists_01.php'>
+    <scanner>
+        <token id='T_VARIABLE' start='816' end='825'>
+            <text>$lexical1</text>
+        </token>
+        <token id='T_EQUAL' start='826' end='827'>
+            <text>=</text>
+        </token>
+        <token id='T_LNUMBER' start='828' end='829'>
+            <text>1</text>
+        </token>
+        <token id='T_SEMICOLON' start='829' end='830'>
+            <text>;</text>
+        </token>
+        <token id='T_VARIABLE' start='831' end='840'>
+            <text>$lexical2</text>
+        </token>
+        <token id='T_EQUAL' start='841' end='842'>
+            <text>=</text>
+        </token>
+        <token id='T_LNUMBER' start='843' end='844'>
+            <text>2</text>
+        </token>
+        <token id='T_SEMICOLON' start='844' end='845'>
+            <text>;</text>
+        </token>
+        <token id='T_VARIABLE' start='847' end='855'>
+            <text>$lambda1</text>
+        </token>
+        <token id='T_EQUAL' start='856' end='857'>
+            <text>=</text>
+        </token>
+        <token id='T_FUNCTION' start='858' end='866'>
+            <text>function</text>
+        </token>
+        <token id='T_OPEN_PARENTHESE' start='867' end='868'>
+            <text>(</text>
+        </token>
+        <token id='T_STRING' start='868' end='871'>
+            <text>int</text>
+        </token>
+        <token id='T_VARIABLE' start='872' end='878'>
+            <text>$param</text>
+        </token>
+        <token id='T_CLOSE_PARENTHESE' start='878' end='879'>
+            <text>)</text>
+        </token>
+        <token id='T_USE' start='880' end='883'>
+            <text>use</text>
+        </token>
+        <token id='T_OPEN_PARENTHESE' start='884' end='885'>
+            <text>(</text>
+        </token>
+        <token id='T_VARIABLE' start='885' end='894'>
+            <text>$lexical1</text>
+        </token>
+        <token id='T_COMMA' start='894' end='895'>
+            <text>,</text>
+        </token>
+        <token id='T_VARIABLE' start='896' end='905'>
+            <text>$lexical2</text>
+        </token>
+        <token id='T_COMMA' start='905' end='906'>
+            <text>,</text>
+        </token>
+        <token id='T_CLOSE_PARENTHESE' start='906' end='907'>
+            <text>)</text>
+        </token>
+        <token id='T_CURLY_OPEN' start='908' end='909'>
+            <text>{</text>
+        </token>
+        <token id='T_CURLY_CLOSE' start='915' end='916'>
+            <text>}</text>
+        </token>
+        <token id='T_SEMICOLON' start='916' end='917'>
+            <text>;</text>
+        </token>
+        <token id='T_VARIABLE' start='919' end='927'>
+            <text>$lambda1</text>
+        </token>
+        <token id='T_EQUAL' start='928' end='929'>
+            <text>=</text>
+        </token>
+        <token id='T_FUNCTION' start='930' end='938'>
+            <text>function</text>
+        </token>
+        <token id='T_OPEN_PARENTHESE' start='939' end='940'>
+            <text>(</text>
+        </token>
+        <token id='T_STRING' start='940' end='943'>
+            <text>int</text>
+        </token>
+        <token id='T_VARIABLE' start='944' end='950'>
+            <text>$param</text>
+        </token>
+        <token id='T_CLOSE_PARENTHESE' start='950' end='951'>
+            <text>)</text>
+        </token>
+        <token id='T_USE' start='952' end='955'>
+            <text>use</text>
+        </token>
+        <token id='T_OPEN_PARENTHESE' start='956' end='957'>
+            <text>(</text>
+        </token>
+        <token id='T_VARIABLE' start='957' end='966'>
+            <text>$lexical1</text>
+        </token>
+        <token id='T_COMMA' start='966' end='967'>
+            <text>,</text>
+        </token>
+        <token id='T_REFERENCE' start='968' end='969'>
+            <text>&amp;</text>
+        </token>
+        <token id='T_VARIABLE' start='969' end='978'>
+            <text>$lexical2</text>
+        </token>
+        <token id='T_COMMA' start='978' end='979'>
+            <text>,</text>
+        </token>
+        <token id='T_CLOSE_PARENTHESE' start='979' end='980'>
+            <text>)</text>
+        </token>
+        <token id='T_CURLY_OPEN' start='981' end='982'>
+            <text>{</text>
+        </token>
+        <token id='T_CURLY_CLOSE' start='988' end='989'>
+            <text>}</text>
+        </token>
+        <token id='T_SEMICOLON' start='989' end='990'>
+            <text>;</text>
+        </token>
+        <token id='T_VARIABLE' start='992' end='1000'>
+            <text>$lambda1</text>
+        </token>
+        <token id='T_EQUAL' start='1001' end='1002'>
+            <text>=</text>
+        </token>
+        <token id='T_STATIC' start='1003' end='1009'>
+            <text>static</text>
+        </token>
+        <token id='T_FUNCTION' start='1010' end='1018'>
+            <text>function</text>
+        </token>
+        <token id='T_OPEN_PARENTHESE' start='1019' end='1020'>
+            <text>(</text>
+        </token>
+        <token id='T_STRING' start='1020' end='1023'>
+            <text>int</text>
+        </token>
+        <token id='T_VARIABLE' start='1024' end='1030'>
+            <text>$param</text>
+        </token>
+        <token id='T_CLOSE_PARENTHESE' start='1030' end='1031'>
+            <text>)</text>
+        </token>
+        <token id='T_USE' start='1032' end='1035'>
+            <text>use</text>
+        </token>
+        <token id='T_OPEN_PARENTHESE' start='1036' end='1037'>
+            <text>(</text>
+        </token>
+        <token id='T_VARIABLE' start='1037' end='1046'>
+            <text>$lexical1</text>
+        </token>
+        <token id='T_COMMA' start='1046' end='1047'>
+            <text>,</text>
+        </token>
+        <token id='T_REFERENCE' start='1048' end='1049'>
+            <text>&amp;</text>
+        </token>
+        <token id='T_VARIABLE' start='1049' end='1058'>
+            <text>$lexical2</text>
+        </token>
+        <token id='T_COMMA' start='1058' end='1059'>
+            <text>,</text>
+        </token>
+        <token id='T_CLOSE_PARENTHESE' start='1059' end='1060'>
+            <text>)</text>
+        </token>
+        <token id='T_CURLY_OPEN' start='1061' end='1062'>
+            <text>{</text>
+        </token>
+        <token id='T_CURLY_CLOSE' start='1068' end='1069'>
+            <text>}</text>
+        </token>
+        <token id='T_SEMICOLON' start='1069' end='1070'>
+            <text>;</text>
+        </token>
+        <token id='T_VARIABLE' start='1072' end='1080'>
+            <text>$lambda2</text>
+        </token>
+        <token id='T_EQUAL' start='1081' end='1082'>
+            <text>=</text>
+        </token>
+        <token id='T_FUNCTION' start='1083' end='1091'>
+            <text>function</text>
+        </token>
+        <token id='T_OPEN_PARENTHESE' start='1092' end='1093'>
+            <text>(</text>
+        </token>
+        <token id='T_STRING' start='1093' end='1096'>
+            <text>int</text>
+        </token>
+        <token id='T_VARIABLE' start='1097' end='1103'>
+            <text>$param</text>
+        </token>
+        <token id='T_CLOSE_PARENTHESE' start='1103' end='1104'>
+            <text>)</text>
+        </token>
+        <token id='T_USE' start='1105' end='1108'>
+            <text>use</text>
+        </token>
+        <token id='T_OPEN_PARENTHESE' start='1109' end='1110'>
+            <text>(</text>
+        </token>
+        <token id='T_VARIABLE' start='1119' end='1128'>
+            <text>$lexical1</text>
+        </token>
+        <token id='T_COMMA' start='1128' end='1129'>
+            <text>,</text>
+        </token>
+        <token id='T_VARIABLE' start='1138' end='1147'>
+            <text>$lexical2</text>
+        </token>
+        <token id='T_COMMA' start='1147' end='1148'>
+            <text>,</text>
+        </token>
+        <token id='T_CLOSE_PARENTHESE' start='1149' end='1150'>
+            <text>)</text>
+        </token>
+        <token id='T_CURLY_OPEN' start='1151' end='1152'>
+            <text>{</text>
+        </token>
+        <token id='T_CURLY_CLOSE' start='1158' end='1159'>
+            <text>}</text>
+        </token>
+        <token id='T_SEMICOLON' start='1159' end='1160'>
+            <text>;</text>
+        </token>
+        <token id='T_VARIABLE' start='1162' end='1170'>
+            <text>$lambda2</text>
+        </token>
+        <token id='T_EQUAL' start='1171' end='1172'>
+            <text>=</text>
+        </token>
+        <token id='T_FUNCTION' start='1173' end='1181'>
+            <text>function</text>
+        </token>
+        <token id='T_OPEN_PARENTHESE' start='1182' end='1183'>
+            <text>(</text>
+        </token>
+        <token id='T_STRING' start='1183' end='1186'>
+            <text>int</text>
+        </token>
+        <token id='T_VARIABLE' start='1187' end='1193'>
+            <text>$param</text>
+        </token>
+        <token id='T_CLOSE_PARENTHESE' start='1193' end='1194'>
+            <text>)</text>
+        </token>
+        <token id='T_USE' start='1195' end='1198'>
+            <text>use</text>
+        </token>
+        <token id='T_OPEN_PARENTHESE' start='1199' end='1200'>
+            <text>(</text>
+        </token>
+        <token id='T_VARIABLE' start='1209' end='1218'>
+            <text>$lexical1</text>
+        </token>
+        <token id='T_COMMA' start='1218' end='1219'>
+            <text>,</text>
+        </token>
+        <token id='T_REFERENCE' start='1228' end='1229'>
+            <text>&amp;</text>
+        </token>
+        <token id='T_VARIABLE' start='1229' end='1238'>
+            <text>$lexical2</text>
+        </token>
+        <token id='T_COMMA' start='1238' end='1239'>
+            <text>,</text>
+        </token>
+        <token id='T_CLOSE_PARENTHESE' start='1240' end='1241'>
+            <text>)</text>
+        </token>
+        <token id='T_CURLY_OPEN' start='1242' end='1243'>
+            <text>{</text>
+        </token>
+        <token id='T_CURLY_CLOSE' start='1249' end='1250'>
+            <text>}</text>
+        </token>
+        <token id='T_SEMICOLON' start='1250' end='1251'>
+            <text>;</text>
+        </token>
+        <token id='T_VARIABLE' start='1253' end='1261'>
+            <text>$lambda2</text>
+        </token>
+        <token id='T_EQUAL' start='1262' end='1263'>
+            <text>=</text>
+        </token>
+        <token id='T_STATIC' start='1264' end='1270'>
+            <text>static</text>
+        </token>
+        <token id='T_FUNCTION' start='1271' end='1279'>
+            <text>function</text>
+        </token>
+        <token id='T_OPEN_PARENTHESE' start='1280' end='1281'>
+            <text>(</text>
+        </token>
+        <token id='T_STRING' start='1281' end='1284'>
+            <text>int</text>
+        </token>
+        <token id='T_VARIABLE' start='1285' end='1291'>
+            <text>$param</text>
+        </token>
+        <token id='T_CLOSE_PARENTHESE' start='1291' end='1292'>
+            <text>)</text>
+        </token>
+        <token id='T_USE' start='1293' end='1296'>
+            <text>use</text>
+        </token>
+        <token id='T_OPEN_PARENTHESE' start='1297' end='1298'>
+            <text>(</text>
+        </token>
+        <token id='T_VARIABLE' start='1307' end='1316'>
+            <text>$lexical1</text>
+        </token>
+        <token id='T_COMMA' start='1316' end='1317'>
+            <text>,</text>
+        </token>
+        <token id='T_REFERENCE' start='1326' end='1327'>
+            <text>&amp;</text>
+        </token>
+        <token id='T_VARIABLE' start='1327' end='1336'>
+            <text>$lexical2</text>
+        </token>
+        <token id='T_COMMA' start='1336' end='1337'>
+            <text>,</text>
+        </token>
+        <token id='T_CLOSE_PARENTHESE' start='1338' end='1339'>
+            <text>)</text>
+        </token>
+        <token id='T_CURLY_OPEN' start='1340' end='1341'>
+            <text>{</text>
+        </token>
+        <token id='T_CURLY_CLOSE' start='1347' end='1348'>
+            <text>}</text>
+        </token>
+        <token id='T_SEMICOLON' start='1348' end='1349'>
+            <text>;</text>
+        </token>
+        <token id='EOF' start='1350' end='1350'>
+            <text></text>
+        </token>
+    </scanner>
+    <Program start='0' end='1350'>
+        <Comments>
+            <Comment start='7' end='814' commentType='multiLine'/>
+            <Comment start='7' end='814' commentType='multiLine'/>
+        </Comments>
+        <Statements>
+            <ExpressionStatement start='816' end='830'>
+                <Assignment start='816' end='829' operator='EQUAL'>
+                    <Variable start='816' end='825' isDollared='true'>
+                        <Identifier start='817' end='825' name='lexical1'/>
+                    </Variable>
+                    <Scalar start='828' end='829' type='INT' value='1'/>
+                </Assignment>
+            </ExpressionStatement>
+            <ExpressionStatement start='831' end='845'>
+                <Assignment start='831' end='844' operator='EQUAL'>
+                    <Variable start='831' end='840' isDollared='true'>
+                        <Identifier start='832' end='840' name='lexical2'/>
+                    </Variable>
+                    <Scalar start='843' end='844' type='INT' value='2'/>
+                </Assignment>
+            </ExpressionStatement>
+            <ExpressionStatement start='847' end='917'>
+                <Assignment start='847' end='916' operator='EQUAL'>
+                    <Variable start='847' end='855' isDollared='true'>
+                        <Identifier start='848' end='855' name='lambda1'/>
+                    </Variable>
+                    <LambdaFunctionDeclaration start='858' end='916' isReference='false'>
+                        <FormalParameter start='868' end='878' isMandatory='true' isVariadic='false'>
+                            <ParametrType>
+                                <NamespaceName start='868' end='871' isCurrent='false' isGlobal='false'>
+                                    <Identifier start='868' end='871' name='int'/>
+                                </NamespaceName>
+                            </ParametrType>
+                            <ParametrName>
+                                <Variable start='872' end='878' isDollared='true'>
+                                    <Identifier start='873' end='878' name='param'/>
+                                </Variable>
+                            </ParametrName>
+                            <DefaultValue>
+                            </DefaultValue>
+                        </FormalParameter>
+                        <Variable start='885' end='894' isDollared='true'>
+                            <Identifier start='886' end='894' name='lexical1'/>
+                        </Variable>
+                        <Variable start='896' end='905' isDollared='true'>
+                            <Identifier start='897' end='905' name='lexical2'/>
+                        </Variable>
+                        <Block start='908' end='916' isCurly='true'>
+                        </Block>
+                    </LambdaFunctionDeclaration>
+                </Assignment>
+            </ExpressionStatement>
+            <ExpressionStatement start='919' end='990'>
+                <Assignment start='919' end='989' operator='EQUAL'>
+                    <Variable start='919' end='927' isDollared='true'>
+                        <Identifier start='920' end='927' name='lambda1'/>
+                    </Variable>
+                    <LambdaFunctionDeclaration start='930' end='989' isReference='false'>
+                        <FormalParameter start='940' end='950' isMandatory='true' isVariadic='false'>
+                            <ParametrType>
+                                <NamespaceName start='940' end='943' isCurrent='false' isGlobal='false'>
+                                    <Identifier start='940' end='943' name='int'/>
+                                </NamespaceName>
+                            </ParametrType>
+                            <ParametrName>
+                                <Variable start='944' end='950' isDollared='true'>
+                                    <Identifier start='945' end='950' name='param'/>
+                                </Variable>
+                            </ParametrName>
+                            <DefaultValue>
+                            </DefaultValue>
+                        </FormalParameter>
+                        <Variable start='957' end='966' isDollared='true'>
+                            <Identifier start='958' end='966' name='lexical1'/>
+                        </Variable>
+                        <Reference start='968' end='978'>
+                            <Variable start='969' end='978' isDollared='true'>
+                                <Identifier start='970' end='978' name='lexical2'/>
+                            </Variable>
+                        </Reference>
+                        <Block start='981' end='989' isCurly='true'>
+                        </Block>
+                    </LambdaFunctionDeclaration>
+                </Assignment>
+            </ExpressionStatement>
+            <ExpressionStatement start='992' end='1070'>
+                <Assignment start='992' end='1069' operator='EQUAL'>
+                    <Variable start='992' end='1000' isDollared='true'>
+                        <Identifier start='993' end='1000' name='lambda1'/>
+                    </Variable>
+                    <LambdaFunctionDeclaration start='1010' end='1069' isReference='false'>
+                        <FormalParameter start='1020' end='1030' isMandatory='true' isVariadic='false'>
+                            <ParametrType>
+                                <NamespaceName start='1020' end='1023' isCurrent='false' isGlobal='false'>
+                                    <Identifier start='1020' end='1023' name='int'/>
+                                </NamespaceName>
+                            </ParametrType>
+                            <ParametrName>
+                                <Variable start='1024' end='1030' isDollared='true'>
+                                    <Identifier start='1025' end='1030' name='param'/>
+                                </Variable>
+                            </ParametrName>
+                            <DefaultValue>
+                            </DefaultValue>
+                        </FormalParameter>
+                        <Variable start='1037' end='1046' isDollared='true'>
+                            <Identifier start='1038' end='1046' name='lexical1'/>
+                        </Variable>
+                        <Reference start='1048' end='1058'>
+                            <Variable start='1049' end='1058' isDollared='true'>
+                                <Identifier start='1050' end='1058' name='lexical2'/>
+                            </Variable>
+                        </Reference>
+                        <Block start='1061' end='1069' isCurly='true'>
+                        </Block>
+                    </LambdaFunctionDeclaration>
+                </Assignment>
+            </ExpressionStatement>
+            <ExpressionStatement start='1072' end='1160'>
+                <Assignment start='1072' end='1159' operator='EQUAL'>
+                    <Variable start='1072' end='1080' isDollared='true'>
+                        <Identifier start='1073' end='1080' name='lambda2'/>
+                    </Variable>
+                    <LambdaFunctionDeclaration start='1083' end='1159' isReference='false'>
+                        <FormalParameter start='1093' end='1103' isMandatory='true' isVariadic='false'>
+                            <ParametrType>
+                                <NamespaceName start='1093' end='1096' isCurrent='false' isGlobal='false'>
+                                    <Identifier start='1093' end='1096' name='int'/>
+                                </NamespaceName>
+                            </ParametrType>
+                            <ParametrName>
+                                <Variable start='1097' end='1103' isDollared='true'>
+                                    <Identifier start='1098' end='1103' name='param'/>
+                                </Variable>
+                            </ParametrName>
+                            <DefaultValue>
+                            </DefaultValue>
+                        </FormalParameter>
+                        <Variable start='1119' end='1128' isDollared='true'>
+                            <Identifier start='1120' end='1128' name='lexical1'/>
+                        </Variable>
+                        <Variable start='1138' end='1147' isDollared='true'>
+                            <Identifier start='1139' end='1147' name='lexical2'/>
+                        </Variable>
+                        <Block start='1151' end='1159' isCurly='true'>
+                        </Block>
+                    </LambdaFunctionDeclaration>
+                </Assignment>
+            </ExpressionStatement>
+            <ExpressionStatement start='1162' end='1251'>
+                <Assignment start='1162' end='1250' operator='EQUAL'>
+                    <Variable start='1162' end='1170' isDollared='true'>
+                        <Identifier start='1163' end='1170' name='lambda2'/>
+                    </Variable>
+                    <LambdaFunctionDeclaration start='1173' end='1250' isReference='false'>
+                        <FormalParameter start='1183' end='1193' isMandatory='true' isVariadic='false'>
+                            <ParametrType>
+                                <NamespaceName start='1183' end='1186' isCurrent='false' isGlobal='false'>
+                                    <Identifier start='1183' end='1186' name='int'/>
+                                </NamespaceName>
+                            </ParametrType>
+                            <ParametrName>
+                                <Variable start='1187' end='1193' isDollared='true'>
+                                    <Identifier start='1188' end='1193' name='param'/>
+                                </Variable>
+                            </ParametrName>
+                            <DefaultValue>
+                            </DefaultValue>
+                        </FormalParameter>
+                        <Variable start='1209' end='1218' isDollared='true'>
+                            <Identifier start='1210' end='1218' name='lexical1'/>
+                        </Variable>
+                        <Reference start='1228' end='1238'>
+                            <Variable start='1229' end='1238' isDollared='true'>
+                                <Identifier start='1230' end='1238' name='lexical2'/>
+                            </Variable>
+                        </Reference>
+                        <Block start='1242' end='1250' isCurly='true'>
+                        </Block>
+                    </LambdaFunctionDeclaration>
+                </Assignment>
+            </ExpressionStatement>
+            <ExpressionStatement start='1253' end='1349'>
+                <Assignment start='1253' end='1348' operator='EQUAL'>
+                    <Variable start='1253' end='1261' isDollared='true'>
+                        <Identifier start='1254' end='1261' name='lambda2'/>
+                    </Variable>
+                    <LambdaFunctionDeclaration start='1271' end='1348' isReference='false'>
+                        <FormalParameter start='1281' end='1291' isMandatory='true' isVariadic='false'>
+                            <ParametrType>
+                                <NamespaceName start='1281' end='1284' isCurrent='false' isGlobal='false'>
+                                    <Identifier start='1281' end='1284' name='int'/>
+                                </NamespaceName>
+                            </ParametrType>
+                            <ParametrName>
+                                <Variable start='1285' end='1291' isDollared='true'>
+                                    <Identifier start='1286' end='1291' name='param'/>
+                                </Variable>
+                            </ParametrName>
+                            <DefaultValue>
+                            </DefaultValue>
+                        </FormalParameter>
+                        <Variable start='1307' end='1316' isDollared='true'>
+                            <Identifier start='1308' end='1316' name='lexical1'/>
+                        </Variable>
+                        <Reference start='1326' end='1336'>
+                            <Variable start='1327' end='1336' isDollared='true'>
+                                <Identifier start='1328' end='1336' name='lexical2'/>
+                            </Variable>
+                        </Reference>
+                        <Block start='1340' end='1348' isCurly='true'>
+                        </Block>
+                    </LambdaFunctionDeclaration>
+                </Assignment>
+            </ExpressionStatement>
+        </Statements>
+    </Program>
+</testresult>
diff --git a/php/php.editor/test/unit/data/testfiles/formatting/php80/allowTrailingCommaInClosureUseLists_01a.php b/php/php.editor/test/unit/data/testfiles/formatting/php80/allowTrailingCommaInClosureUseLists_01a.php
new file mode 100644
index 0000000..cb27247
--- /dev/null
+++ b/php/php.editor/test/unit/data/testfiles/formatting/php80/allowTrailingCommaInClosureUseLists_01a.php
@@ -0,0 +1,59 @@
+<?php
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+$lexical1 = 1;
+$lexical2 = 2;
+
+$lambda1 = function (int $param) use (   $lexical1, $lexical2,    ) {
+};
+
+$lambda1 = function (int $param) use ( $lexical1  , &$lexical2  ,) {
+};
+
+$lambda1 = static function (int $param) use (   $lexical1  , &$lexical2, ) {
+};
+
+$lambda2 = function (int $param) use (
+$lexical1,
+$lexical2,
+) {
+};
+
+$lambda2 = function (int $param) use (
+$lexical1,
+&$lexical2,
+) {
+};
+
+$lambda2 = static function (int $param) use (
+$lexical1,
+&$lexical2,
+) {
+};
+
+$lambda2 = static function (
+int $param1,
+int|string $param2,
+) use (
+$lexical1,
+&$lexical2,
+) {
+};
diff --git a/php/php.editor/test/unit/data/testfiles/formatting/php80/allowTrailingCommaInClosureUseLists_01a.php.formatted b/php/php.editor/test/unit/data/testfiles/formatting/php80/allowTrailingCommaInClosureUseLists_01a.php.formatted
new file mode 100644
index 0000000..f438de1
--- /dev/null
+++ b/php/php.editor/test/unit/data/testfiles/formatting/php80/allowTrailingCommaInClosureUseLists_01a.php.formatted
@@ -0,0 +1,66 @@
+<?php
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+$lexical1 = 1;
+$lexical2 = 2;
+
+$lambda1 = function (int $param) use ($lexical1, $lexical2,) {
+    
+};
+
+$lambda1 = function (int $param) use ($lexical1, &$lexical2,) {
+    
+};
+
+$lambda1 = static function (int $param) use ($lexical1, &$lexical2,) {
+    
+};
+
+$lambda2 = function (int $param) use (
+        $lexical1,
+        $lexical2,
+) {
+    
+};
+
+$lambda2 = function (int $param) use (
+        $lexical1,
+        &$lexical2,
+) {
+    
+};
+
+$lambda2 = static function (int $param) use (
+        $lexical1,
+        &$lexical2,
+) {
+    
+};
+
+$lambda2 = static function (
+        int $param1,
+        int|string $param2,
+) use (
+        $lexical1,
+        &$lexical2,
+) {
+    
+};
diff --git a/php/php.editor/test/unit/data/testfiles/formatting/php80/allowTrailingCommaInClosureUseLists_01b.php b/php/php.editor/test/unit/data/testfiles/formatting/php80/allowTrailingCommaInClosureUseLists_01b.php
new file mode 100644
index 0000000..cb27247
--- /dev/null
+++ b/php/php.editor/test/unit/data/testfiles/formatting/php80/allowTrailingCommaInClosureUseLists_01b.php
@@ -0,0 +1,59 @@
+<?php
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+$lexical1 = 1;
+$lexical2 = 2;
+
+$lambda1 = function (int $param) use (   $lexical1, $lexical2,    ) {
+};
+
+$lambda1 = function (int $param) use ( $lexical1  , &$lexical2  ,) {
+};
+
+$lambda1 = static function (int $param) use (   $lexical1  , &$lexical2, ) {
+};
+
+$lambda2 = function (int $param) use (
+$lexical1,
+$lexical2,
+) {
+};
+
+$lambda2 = function (int $param) use (
+$lexical1,
+&$lexical2,
+) {
+};
+
+$lambda2 = static function (int $param) use (
+$lexical1,
+&$lexical2,
+) {
+};
+
+$lambda2 = static function (
+int $param1,
+int|string $param2,
+) use (
+$lexical1,
+&$lexical2,
+) {
+};
diff --git a/php/php.editor/test/unit/data/testfiles/formatting/php80/allowTrailingCommaInClosureUseLists_01b.php.formatted b/php/php.editor/test/unit/data/testfiles/formatting/php80/allowTrailingCommaInClosureUseLists_01b.php.formatted
new file mode 100644
index 0000000..566e73f
--- /dev/null
+++ b/php/php.editor/test/unit/data/testfiles/formatting/php80/allowTrailingCommaInClosureUseLists_01b.php.formatted
@@ -0,0 +1,66 @@
+<?php
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+$lexical1 = 1;
+$lexical2 = 2;
+
+$lambda1 = function (int $param) use ($lexical1, $lexical2,) {
+    
+};
+
+$lambda1 = function (int $param) use ($lexical1, &$lexical2,) {
+    
+};
+
+$lambda1 = static function (int $param) use ($lexical1, &$lexical2,) {
+    
+};
+
+$lambda2 = function (int $param) use (
+    $lexical1,
+    $lexical2,
+) {
+    
+};
+
+$lambda2 = function (int $param) use (
+    $lexical1,
+    &$lexical2,
+) {
+    
+};
+
+$lambda2 = static function (int $param) use (
+    $lexical1,
+    &$lexical2,
+) {
+    
+};
+
+$lambda2 = static function (
+    int $param1,
+    int|string $param2,
+) use (
+    $lexical1,
+    &$lexical2,
+) {
+    
+};
diff --git a/php/php.editor/test/unit/data/testfiles/parser/php80/allowTrailingCommaInClosureUseLists_01.php b/php/php.editor/test/unit/data/testfiles/parser/php80/allowTrailingCommaInClosureUseLists_01.php
new file mode 100644
index 0000000..d844ce5
--- /dev/null
+++ b/php/php.editor/test/unit/data/testfiles/parser/php80/allowTrailingCommaInClosureUseLists_01.php
@@ -0,0 +1,56 @@
+<?php
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+$lexical1 = 1;
+$lexical2 = 2;
+
+$lambda1 = function (int $param) use ($lexical1, $lexical2,) {
+    
+};
+
+$lambda1 = function (int $param) use ($lexical1, &$lexical2,) {
+    
+};
+
+$lambda1 = static function (int $param) use ($lexical1, &$lexical2,) {
+    
+};
+
+$lambda2 = function (int $param) use (
+        $lexical1,
+        $lexical2,
+) {
+    
+};
+
+$lambda2 = function (int $param) use (
+        $lexical1,
+        &$lexical2,
+) {
+    
+};
+
+$lambda2 = static function (int $param) use (
+        $lexical1,
+        &$lexical2,
+) {
+    
+};
diff --git a/php/php.editor/test/unit/data/testfiles/parser/php80/allowTrailingCommaInClosureUseLists_01.php.errors b/php/php.editor/test/unit/data/testfiles/parser/php80/allowTrailingCommaInClosureUseLists_01.php.errors
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/php/php.editor/test/unit/data/testfiles/parser/php80/allowTrailingCommaInClosureUseLists_01.php.errors
@@ -0,0 +1 @@
+
diff --git a/php/php.editor/test/unit/src/org/netbeans/modules/php/editor/indent/PHPFormatterTest.java b/php/php.editor/test/unit/src/org/netbeans/modules/php/editor/indent/PHPFormatterTest.java
index e05edaf..cea9b25 100644
--- a/php/php.editor/test/unit/src/org/netbeans/modules/php/editor/indent/PHPFormatterTest.java
+++ b/php/php.editor/test/unit/src/org/netbeans/modules/php/editor/indent/PHPFormatterTest.java
@@ -921,6 +921,17 @@ public class PHPFormatterTest extends PHPFormatterTestBase {
         reformatFileContents("testfiles/formatting/php80/constructorPropertyPromotion_01b.php", options);
     }
 
+    public void testAllowTrailingCommaInClosureUseLists_01a() throws Exception {
+        HashMap<String, Object> options = new HashMap<>(FmtOptions.getDefaults());
+        reformatFileContents("testfiles/formatting/php80/allowTrailingCommaInClosureUseLists_01a.php", options);
+    }
+
+    public void testAllowTrailingCommaInClosureUseLists_01b() throws Exception {
+        HashMap<String, Object> options = new HashMap<>(FmtOptions.getDefaults());
+        options.put(FmtOptions.CONTINUATION_INDENT_SIZE, 4);
+        reformatFileContents("testfiles/formatting/php80/allowTrailingCommaInClosureUseLists_01b.php", options);
+    }
+
     public void testNetBeans4970() throws Exception {
         HashMap<String, Object> options = new HashMap<>(FmtOptions.getDefaults());
         reformatFileContents("testfiles/formatting/netbeans4970.php", options);
diff --git a/php/php.editor/test/unit/src/org/netbeans/modules/php/editor/parser/ASTPHP5ParserTest.java b/php/php.editor/test/unit/src/org/netbeans/modules/php/editor/parser/ASTPHP5ParserTest.java
index d9e7849..07df5c7 100644
--- a/php/php.editor/test/unit/src/org/netbeans/modules/php/editor/parser/ASTPHP5ParserTest.java
+++ b/php/php.editor/test/unit/src/org/netbeans/modules/php/editor/parser/ASTPHP5ParserTest.java
@@ -1285,6 +1285,10 @@ public class ASTPHP5ParserTest extends ParserTestBase {
         performTest("parser/php80/constructorPropertyPromotionErrorWithStatic");
     }
 
+    public void testAllowTrailingCommaInClosureUseLists_01() throws Exception {
+        performTest("parser/php80/allowTrailingCommaInClosureUseLists_01");
+    }
+
     @Override
     protected String getTestResult(String filename) throws Exception {
         // the same <Comment /> is shown twice becase the scanner is used twice
diff --git a/php/php.editor/test/unit/src/org/netbeans/modules/php/editor/parser/PhpParserErrorTest.java b/php/php.editor/test/unit/src/org/netbeans/modules/php/editor/parser/PhpParserErrorTest.java
index fec11e5..4e32131 100644
--- a/php/php.editor/test/unit/src/org/netbeans/modules/php/editor/parser/PhpParserErrorTest.java
+++ b/php/php.editor/test/unit/src/org/netbeans/modules/php/editor/parser/PhpParserErrorTest.java
@@ -1212,4 +1212,7 @@ public class PhpParserErrorTest extends PHPTestBase {
         checkErrors("testfiles/parser/php80/constructorPropertyPromotionErrorWithStatic.php");
     }
 
+    public void testAllowTrailingCommaInClosureUseLists_01() throws Exception {
+        checkErrors("testfiles/parser/php80/allowTrailingCommaInClosureUseLists_01.php");
+    }
 }
diff --git a/php/php.editor/tools/ASTPHP5Parser.cup b/php/php.editor/tools/ASTPHP5Parser.cup
index 218e541..ad23a8a 100644
--- a/php/php.editor/tools/ASTPHP5Parser.cup
+++ b/php/php.editor/tools/ASTPHP5Parser.cup
@@ -3750,7 +3750,7 @@ lexical_vars ::=
     RESULT = null;
 :}
 
-| T_USE:s T_OPEN_PARENTHESE lexical_var_list:list T_CLOSE_PARENTHESE:e
+| T_USE:s T_OPEN_PARENTHESE lexical_var_list:list possible_comma T_CLOSE_PARENTHESE:e
 {:
     RESULT = list;
 :}


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@netbeans.apache.org
For additional commands, e-mail: commits-help@netbeans.apache.org

For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists