[NETBEANS-5599] PHP 8.1 Support: Enumerations (Part 1)

- https://issues.apache.org/jira/browse/NETBEANS-5599 - https://wiki.php.net/rfc/enumerations - Fix the parser, the lexer, and `PHP81UnhandledError` - Add and fix unit tests
Panthereum · Apr 7, 2022 · bdae9ea · bdae9ea
1 parent a6824d6
commit bdae9ea
Show file tree

Hide file tree

Showing 49 changed files with 50,243 additions and 46,310 deletions.
diff --git a/php/php.editor/src/org/netbeans/modules/php/editor/lexer/PHP5ColoringLexer.java b/php/php.editor/src/org/netbeans/modules/php/editor/lexer/PHP5ColoringLexer.java
diff --git a/php/php.editor/src/org/netbeans/modules/php/editor/lexer/PHPTokenId.java b/php/php.editor/src/org/netbeans/modules/php/editor/lexer/PHPTokenId.java
@@ -40,7 +40,7 @@
  */
 public enum PHPTokenId implements TokenId {
 
-    T_INLINE_HTML(null, "php"),
+    T_INLINE_HTML(null, "php"), // NOI18N
     PHP_OPENTAG(null, "phpopenclose"), //NOI18N
     T_OPEN_TAG_WITH_ECHO(null, "phpopenclose"),
     PHP_CLOSETAG(null, "phpopenclose"), //NOI18N
@@ -70,6 +70,7 @@ public enum PHPTokenId implements TokenId {
     PHP_EMPTY(null, "keyword"), //NOI18N
     PHP_CLASS("class", "keyword"), //NOI18N
     PHP_TRAIT("trait", "keyword"), //NOI18N
+    PHP_ENUM("enum", "keyword"), //NOI18N PHP 8.1
     PHP_FOR("for", "keyword"), //NOI18N
     PHP_STRING(null, "identifier"), //NOI18N
     PHP_AS(null, "keyword"), //NOI18N

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
diff --git a/php/php.editor/src/org/netbeans/modules/php/editor/parser/ASTPHP5Scanner.java b/php/php.editor/src/org/netbeans/modules/php/editor/parser/ASTPHP5Scanner.java
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
@@ -19,7 +19,7 @@
 
 //----------------------------------------------------
 // The following code was generated by CUP v0.11a beta 20060608
-// Fri Jan 14 13:12:13 JST 2022
+// Sun Mar 27 21:05:05 JST 2022
 //----------------------------------------------------
 
 package org.netbeans.modules.php.editor.parser;
@@ -193,6 +193,7 @@ public interface ASTPHP5Symbols {
   public static final int T_DIV_EQUAL = 94;
   public static final int T_NUM_STRING = 9;
   public static final int T_HALT_COMPILER = 50;
+  public static final int T_ENUM = 168;
   public static final int T_GOTO = 33;
   public static final int T_READONLY = 166;
 }

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