You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@netbeans.apache.org by ne...@apache.org on 2019/06/18 08:34:22 UTC
[netbeans] 01/01: Revert "[NETBEANS-1696] PHP 7.4 Support: Typed
Properties 2.0"
This is an automated email from the ASF dual-hosted git repository.
neilcsmith pushed a commit to branch revert-1301-netbeans-1696-php7.4-support
in repository https://gitbox.apache.org/repos/asf/netbeans.git
commit 97da3c230b72ad2da90c752cd4f23135c4b13faf
Author: Neil C Smith <ne...@googlemail.com>
AuthorDate: Tue Jun 18 09:34:12 2019 +0100
Revert "[NETBEANS-1696] PHP 7.4 Support: Typed Properties 2.0"
---
.../php/editor/api/elements/FieldElement.java | 1 -
.../editor/completion/CompletionContextFinder.java | 17 +-
.../php/editor/completion/PHPCodeCompletion.java | 107 +-
.../php/editor/elements/FieldElementImpl.java | 35 +-
.../modules/php/editor/indent/FormatVisitor.java | 22 +-
.../modules/php/editor/index/PHPIndexer.java | 6 +-
.../modules/php/editor/model/FieldElement.java | 3 +-
.../php/editor/model/impl/FieldElementImpl.java | 18 +-
.../php/editor/model/impl/ModelBuilder.java | 7 +-
.../php/editor/model/impl/ModelVisitor.java | 34 +-
.../modules/php/editor/model/impl/Type.java | 12 -
.../model/nodes/SingleFieldDeclarationInfo.java | 14 -
.../modules/php/editor/parser/ASTPHP5Parser.java | 1449 ++++++++++----------
.../modules/php/editor/parser/ASTPHP5Symbols.java | 2 +-
.../php/editor/parser/EncodedActionTable1.java | 114 +-
.../php/editor/parser/EncodedActionTable10.java | 394 +++---
.../php/editor/parser/EncodedActionTable11.java | 386 +++---
.../php/editor/parser/EncodedActionTable12.java | 406 +++---
.../php/editor/parser/EncodedActionTable13.java | 456 +++---
.../php/editor/parser/EncodedActionTable14.java | 194 +--
.../php/editor/parser/EncodedActionTable4.java | 354 ++---
.../php/editor/parser/EncodedActionTable5.java | 342 ++---
.../php/editor/parser/EncodedActionTable6.java | 356 ++---
.../php/editor/parser/EncodedActionTable7.java | 362 ++---
.../php/editor/parser/EncodedActionTable8.java | 386 +++---
.../php/editor/parser/EncodedActionTable9.java | 480 +++----
.../editor/parser/astnodes/FieldsDeclaration.java | 29 +-
.../parser/astnodes/SingleFieldDeclaration.java | 22 +-
.../parser/astnodes/visitors/DefaultVisitor.java | 3 +-
.../modules/php/editor/resources/layer.xml | 1 -
.../verification/FieldRedeclarationHintError.java | 7 +-
.../editor/verification/PHP74UnhandledError.java | 16 -
.../verification/UnusableTypesUnhandledError.java | 190 ---
.../ASTPHP5ParserTest/parser/TextSearchQuery.pass | 26 -
.../parser/anonymousClass_01.pass | 10 -
.../ASTPHP5ParserTest/parser/heredoc_015.pass | 2 -
.../ASTPHP5ParserTest/parser/issue258959.pass | 2 -
.../ASTPHP5ParserTest/parser/issue271109.pass | 2 -
.../parser/php73/heredoc_indent_spaces_01.pass | 2 -
.../parser/php73/heredoc_indent_spaces_02.pass | 2 -
.../parser/php73/heredoc_indent_tabs_01.pass | 2 -
.../parser/php73/heredoc_indent_tabs_02.pass | 2 -
.../parser/php73/nowdoc_indent_spaces_01.pass | 2 -
.../parser/php73/nowdoc_indent_spaces_02.pass | 2 -
.../parser/php73/nowdoc_indent_tabs_01.pass | 2 -
.../parser/php73/nowdoc_indent_tabs_02.pass | 2 -
.../parser/php74/typedPropertiesClass.pass | 910 ------------
.../parser/php74/typedPropertiesTrait.pass | 906 ------------
.../parser/shortArraysStaticScalar_01.pass | 2 -
.../parser/uniformVariableSyntax_33.pass | 2 -
.../parser/SanitizeSourceTest/sanitize/case01.pass | 2 -
.../SanitizeSourceTest/sanitize/curly05.pass | 2 -
.../SanitizeSourceTest/sanitize/curly06.pass | 2 -
.../SanitizeSourceTest/sanitize/curly07.pass | 2 -
.../SanitizeSourceTest/sanitize/curly08.pass | 2 -
.../SanitizeSourceTest/sanitize/sanitize003.pass | 4 -
.../SanitizeSourceTest/sanitize/sanitize005.pass | 2 -
.../SanitizeSourceTest/sanitize/sanitize006.pass | 4 -
.../SanitizeSourceTest/sanitize/sanitize007.pass | 2 -
.../SanitizeSourceTest/sanitize/sanitize008.pass | 2 -
.../SanitizeSourceTest/sanitize/sanitize009.pass | 2 -
.../SanitizeSourceTest/sanitize/sanitize010.pass | 2 -
.../SanitizeSourceTest/sanitize/sanitize011.pass | 2 -
.../SanitizeSourceTest/sanitize/sanitize012.pass | 2 -
.../SanitizeSourceTest/sanitize/sanitize013.pass | 2 -
.../SanitizeSourceTest/sanitize/sanitize014.pass | 2 -
.../SanitizeSourceTest/sanitize/sanitize015.pass | 2 -
.../SanitizeSourceTest/sanitize/sanitize016.pass | 2 -
.../SanitizeSourceTest/sanitize/sanitize017.pass | 2 -
...nsideClass2.php.testInsideClassAdv_1.completion | 2 -
...nsideClass2.php.testInsideClassAdv_2.completion | 2 -
...ousClass01.php.testAnonymousClass01e.completion | 3 -
.../typedProperties20Class.php | 57 -
...ss.php.testTypedProperties20Class_01.completion | 5 -
...ss.php.testTypedProperties20Class_02.completion | 5 -
...ss.php.testTypedProperties20Class_03.completion | 5 -
...ss.php.testTypedProperties20Class_04.completion | 5 -
...ss.php.testTypedProperties20Class_05.completion | 5 -
...ss.php.testTypedProperties20Class_06.completion | 26 -
....testTypedProperties20Class_06_php73.completion | 13 -
...ss.php.testTypedProperties20Class_07.completion | 13 -
...ss.php.testTypedProperties20Class_08.completion | 26 -
....testTypedProperties20Class_08_php73.completion | 13 -
...ss.php.testTypedProperties20Class_09.completion | 13 -
...ss.php.testTypedProperties20Class_10.completion | 17 -
...ss.php.testTypedProperties20Class_11.completion | 4 -
...ss.php.testTypedProperties20Class_12.completion | 4 -
...ss.php.testTypedProperties20Class_13.completion | 5 -
...ss.php.testTypedProperties20Class_14.completion | 4 -
...ss.php.testTypedProperties20Class_15.completion | 4 -
...ss.php.testTypedProperties20Class_16.completion | 26 -
....testTypedProperties20Class_16_php73.completion | 13 -
...ss.php.testTypedProperties20Class_17.completion | 26 -
....testTypedProperties20Class_17_php73.completion | 13 -
...ss.php.testTypedProperties20Class_18.completion | 13 -
.../typedProperties20Trait.php | 57 -
...it.php.testTypedProperties20Trait_01.completion | 5 -
...it.php.testTypedProperties20Trait_02.completion | 5 -
...it.php.testTypedProperties20Trait_03.completion | 5 -
...it.php.testTypedProperties20Trait_04.completion | 5 -
...it.php.testTypedProperties20Trait_05.completion | 5 -
...it.php.testTypedProperties20Trait_06.completion | 25 -
....testTypedProperties20Trait_06_php73.completion | 13 -
...it.php.testTypedProperties20Trait_07.completion | 13 -
...it.php.testTypedProperties20Trait_08.completion | 25 -
....testTypedProperties20Trait_08_php73.completion | 13 -
...it.php.testTypedProperties20Trait_09.completion | 16 -
...it.php.testTypedProperties20Trait_10.completion | 13 -
...it.php.testTypedProperties20Trait_11.completion | 16 -
...it.php.testTypedProperties20Trait_12.completion | 4 -
...it.php.testTypedProperties20Trait_13.completion | 4 -
...it.php.testTypedProperties20Trait_14.completion | 5 -
...it.php.testTypedProperties20Trait_15.completion | 4 -
...it.php.testTypedProperties20Trait_16.completion | 4 -
...it.php.testTypedProperties20Trait_17.completion | 25 -
....testTypedProperties20Trait_17_php73.completion | 13 -
...it.php.testTypedProperties20Trait_18.completion | 25 -
....testTypedProperties20Trait_18_php73.completion | 13 -
...it.php.testTypedProperties20Trait_19.completion | 13 -
.../formatting/blankLines/TypedProperties20_01.php | 28 -
.../blankLines/TypedProperties20_01.php.formatted | 26 -
.../formatting/blankLines/TypedProperties20_02.php | 34 -
.../blankLines/TypedProperties20_02.php.formatted | 27 -
.../formatting/blankLines/TypedProperties20_03.php | 31 -
.../blankLines/TypedProperties20_03.php.formatted | 30 -
.../formatting/blankLines/TypedProperties20_04.php | 27 -
.../blankLines/TypedProperties20_04.php.formatted | 30 -
.../formatting/blankLines/TypedProperties20_05.php | 31 -
.../blankLines/TypedProperties20_05.php.formatted | 31 -
.../blankLines/TypedProperties20_05a.php | 31 -
.../blankLines/TypedProperties20_05a.php.formatted | 31 -
.../blankLines/TypedProperties20_05b.php | 31 -
.../blankLines/TypedProperties20_05b.php.formatted | 31 -
.../formatting/blankLines/TypedProperties20_06.php | 36 -
.../blankLines/TypedProperties20_06.php.formatted | 34 -
.../blankLines/TypedProperties20_06a.php | 36 -
.../blankLines/TypedProperties20_06a.php.formatted | 34 -
.../blankLines/TypedProperties20_06b.php | 36 -
.../blankLines/TypedProperties20_06b.php.formatted | 34 -
.../formatting/blankLines/TypedProperties20_07.php | 36 -
.../blankLines/TypedProperties20_07.php.formatted | 36 -
.../blankLines/TypedProperties20_07a.php | 36 -
.../blankLines/TypedProperties20_07a.php.formatted | 36 -
.../formatting/blankLines/TypedProperties20_08.php | 45 -
.../blankLines/TypedProperties20_08.php.formatted | 51 -
.../formatting/blankLines/TypedProperties20_09.php | 51 -
.../blankLines/TypedProperties20_09.php.formatted | 57 -
.../formatting/blankLines/TypedProperties20_10.php | 30 -
.../blankLines/TypedProperties20_10.php.formatted | 36 -
.../formatting/blankLines/TypedProperties20_11.php | 25 -
.../blankLines/TypedProperties20_11.php.formatted | 31 -
.../testfiles/formatting/typedProperties20_01.php | 57 -
.../formatting/typedProperties20_01.php.formatted | 53 -
.../testTypedProperties20Class.php | 34 -
.../testTypedProperties20Trait.php | 34 -
.../testPHP74TypedPropertiesClass.php | 60 -
.../testPHP74TypedPropertiesClass.php.indexed | 118 --
.../testPHP74TypedPropertiesTrait.php | 60 -
.../testPHP74TypedPropertiesTrait.php.indexed | 118 --
.../testTypedProperties20Class.php | 34 -
.../testTypedProperties20Trait.php | 34 -
.../parser/fieldModificators_03.php.errors | 4 +-
.../parser/fieldModificators_04.php.errors | 4 +-
.../parser/fieldModificators_05.php.errors | 4 +-
.../parser/methodModificators_01.php.errors | 4 +-
.../parser/methodModificators_02.php.errors | 4 +-
.../parser/methodModificators_03.php.errors | 4 +-
.../parser/php74/typedPropertiesClass.php | 53 -
.../parser/php74/typedPropertiesClass.php.errors | 1 -
.../parser/php74/typedPropertiesTrait.php | 53 -
.../parser/php74/typedPropertiesTrait.php.errors | 1 -
...s.php.testTypedProperties20Class_01.occurrences | 6 -
...s.php.testTypedProperties20Class_02.occurrences | 6 -
...s.php.testTypedProperties20Class_03.occurrences | 6 -
...s.php.testTypedProperties20Class_04.occurrences | 6 -
...s.php.testTypedProperties20Class_05.occurrences | 6 -
...s.php.testTypedProperties20Class_06.occurrences | 6 -
...s.php.testTypedProperties20Class_07.occurrences | 5 -
...s.php.testTypedProperties20Class_08.occurrences | 5 -
...s.php.testTypedProperties20Class_09.occurrences | 5 -
...s.php.testTypedProperties20Class_10.occurrences | 5 -
...s.php.testTypedProperties20Class_11.occurrences | 5 -
...s.php.testTypedProperties20Class_12.occurrences | 5 -
...s.php.testTypedProperties20Class_13.occurrences | 5 -
...s.php.testTypedProperties20Class_14.occurrences | 5 -
...s.php.testTypedProperties20Class_15.occurrences | 5 -
...s.php.testTypedProperties20Class_16.occurrences | 5 -
...t.php.testTypedProperties20Trait_01.occurrences | 6 -
...t.php.testTypedProperties20Trait_02.occurrences | 6 -
...t.php.testTypedProperties20Trait_03.occurrences | 6 -
...t.php.testTypedProperties20Trait_04.occurrences | 6 -
...t.php.testTypedProperties20Trait_05.occurrences | 6 -
...t.php.testTypedProperties20Trait_06.occurrences | 6 -
...t.php.testTypedProperties20Trait_07.occurrences | 5 -
...t.php.testTypedProperties20Trait_08.occurrences | 5 -
...t.php.testTypedProperties20Trait_09.occurrences | 5 -
...t.php.testTypedProperties20Trait_10.occurrences | 5 -
...t.php.testTypedProperties20Trait_11.occurrences | 5 -
...t.php.testTypedProperties20Trait_12.occurrences | 5 -
...t.php.testTypedProperties20Trait_13.occurrences | 5 -
...t.php.testTypedProperties20Trait_14.occurrences | 5 -
...t.php.testTypedProperties20Trait_15.occurrences | 5 -
...t.php.testTypedProperties20Trait_16.occurrences | 5 -
...tFieldRedeclarationTypedProperties20Hint_01.php | 59 -
...ieldRedeclarationTypedProperties20Hint_01.hints | 63 -
...tFieldRedeclarationTypedProperties20Hint_02.php | 109 --
...ieldRedeclarationTypedProperties20Hint_02.hints | 0
.../testUnusedUsesHintWithTypedProperties.php | 42 -
...php.testUnusedUsesHintWithTypedProperties.hints | 0
.../editor/completion/PHP74CodeCompletionTest.java | 260 ----
.../php/editor/csl/GotoDeclarationPHP74Test.java | 132 --
.../editor/csl/OccurrencesFinderImplPHP74Test.java | 158 ---
.../editor/indent/PHPFormatterBlankLinesTest.java | 100 --
.../php/editor/indent/PHPFormatterTest.java | 5 -
.../modules/php/editor/index/PHPIndexTest.java | 9 -
.../php/editor/parser/ASTPHP5ParserTest.java | 8 -
.../php/editor/parser/PhpParserErrorTest.java | 8 -
.../modules/php/editor/parser/PrintASTVisitor.java | 1 -
.../modules/php/editor/verification/HintsTest.java | 15 +-
php/php.editor/tools/ASTPHP5Parser.cup | 11 +-
220 files changed, 2849 insertions(+), 8929 deletions(-)
diff --git a/php/php.editor/src/org/netbeans/modules/php/editor/api/elements/FieldElement.java b/php/php.editor/src/org/netbeans/modules/php/editor/api/elements/FieldElement.java
index e7599b4..0fd528d 100644
--- a/php/php.editor/src/org/netbeans/modules/php/editor/api/elements/FieldElement.java
+++ b/php/php.editor/src/org/netbeans/modules/php/editor/api/elements/FieldElement.java
@@ -27,5 +27,4 @@ import org.netbeans.modules.php.editor.api.PhpElementKind;
public interface FieldElement extends TypedInstanceElement, TypeMemberElement {
PhpElementKind KIND = PhpElementKind.FIELD;
String getName(boolean dollared);
- boolean isAnnotation();
}
diff --git a/php/php.editor/src/org/netbeans/modules/php/editor/completion/CompletionContextFinder.java b/php/php.editor/src/org/netbeans/modules/php/editor/completion/CompletionContextFinder.java
index f7ba84a..2ae6789 100644
--- a/php/php.editor/src/org/netbeans/modules/php/editor/completion/CompletionContextFinder.java
+++ b/php/php.editor/src/org/netbeans/modules/php/editor/completion/CompletionContextFinder.java
@@ -33,9 +33,9 @@ import org.netbeans.api.lexer.TokenId;
import org.netbeans.api.lexer.TokenSequence;
import org.netbeans.api.lexer.TokenUtilities;
import org.netbeans.modules.csl.spi.ParserResult;
-import org.netbeans.modules.php.editor.NavUtils;
import org.netbeans.modules.php.editor.lexer.LexUtilities;
import org.netbeans.modules.php.editor.lexer.PHPTokenId;
+import org.netbeans.modules.php.editor.NavUtils;
import org.netbeans.modules.php.editor.parser.PHPParseResult;
import org.netbeans.modules.php.editor.parser.api.Utils;
import org.netbeans.modules.php.editor.parser.astnodes.ASTError;
@@ -153,16 +153,6 @@ final class CompletionContextFinder {
new Object[]{PHPTokenId.PHP_FUNCTION},
new Object[]{PHPTokenId.PHP_FUNCTION, PHPTokenId.WHITESPACE},
new Object[]{PHPTokenId.PHP_FUNCTION, PHPTokenId.WHITESPACE, PHPTokenId.PHP_STRING});
- private static final List<Object[]> FIELD_TYPE_TOKENCHAINS = Arrays.asList(
- new Object[]{PHPTokenId.PHP_PRIVATE, PHPTokenId.WHITESPACE, NAMESPACE_FALSE_TOKEN},
- new Object[]{PHPTokenId.PHP_PROTECTED, PHPTokenId.WHITESPACE, NAMESPACE_FALSE_TOKEN},
- new Object[]{PHPTokenId.PHP_PUBLIC, PHPTokenId.WHITESPACE, NAMESPACE_FALSE_TOKEN},
- new Object[]{PHPTokenId.PHP_STATIC, PHPTokenId.WHITESPACE, NAMESPACE_FALSE_TOKEN},
- new Object[]{PHPTokenId.PHP_VAR, PHPTokenId.WHITESPACE, NAMESPACE_FALSE_TOKEN},
- new Object[]{PHPTokenId.PHP_TOKEN}, // ? (nullable)
- new Object[]{PHPTokenId.PHP_TOKEN, PHPTokenId.PHP_STRING},
- new Object[]{PHPTokenId.PHP_TOKEN, NAMESPACE_FALSE_TOKEN}
- );
private static final List<Object[]> CLASS_CONTEXT_KEYWORDS_TOKENCHAINS = Arrays.asList(
new Object[]{PHPTokenId.PHP_PRIVATE},
new Object[]{PHPTokenId.PHP_PRIVATE, PHPTokenId.WHITESPACE},
@@ -202,7 +192,7 @@ final class CompletionContextFinder {
public static enum CompletionContext {
- EXPRESSION, HTML, CLASS_NAME, INTERFACE_NAME, TYPE_NAME, RETURN_TYPE_NAME, FIELD_TYPE_NAME, STRING,
+ EXPRESSION, HTML, CLASS_NAME, INTERFACE_NAME, TYPE_NAME, RETURN_TYPE_NAME, STRING,
CLASS_MEMBER, STATIC_CLASS_MEMBER, PHPDOC, INHERITANCE, EXTENDS, IMPLEMENTS, METHOD_NAME,
CLASS_CONTEXT_KEYWORDS, SERVER_ENTRY_CONSTANTS, NONE, NEW_CLASS, GLOBAL, NAMESPACE_KEYWORD,
GROUP_USE_KEYWORD, GROUP_USE_CONST_KEYWORD, GROUP_USE_FUNCTION_KEYWORD,
@@ -311,9 +301,6 @@ final class CompletionContextFinder {
CompletionContext paramContext = getParamaterContext(token, caretOffset, tokenSequence);
if (paramContext != null) {
return paramContext;
- } else if (acceptTokenChains(tokenSequence, FIELD_TYPE_TOKENCHAINS, moveNextSucces)) {
- // \Namespace\ClassName, ?, ?ClassName, ?\Namespace\ClassName etc.
- return CompletionContext.FIELD_TYPE_NAME;
} else if (acceptTokenChains(tokenSequence, CLASS_CONTEXT_KEYWORDS_TOKENCHAINS, moveNextSucces)) {
return CompletionContext.CLASS_CONTEXT_KEYWORDS;
}
diff --git a/php/php.editor/src/org/netbeans/modules/php/editor/completion/PHPCodeCompletion.java b/php/php.editor/src/org/netbeans/modules/php/editor/completion/PHPCodeCompletion.java
index 3d9b685..d94f81c 100644
--- a/php/php.editor/src/org/netbeans/modules/php/editor/completion/PHPCodeCompletion.java
+++ b/php/php.editor/src/org/netbeans/modules/php/editor/completion/PHPCodeCompletion.java
@@ -58,7 +58,12 @@ import org.netbeans.modules.parsing.spi.indexing.support.QuerySupport;
import org.netbeans.modules.parsing.spi.indexing.support.QuerySupport.Kind;
import org.netbeans.modules.php.api.PhpVersion;
import org.netbeans.modules.php.editor.CodeUtils;
-import org.netbeans.modules.php.editor.NavUtils;
+import org.netbeans.modules.php.editor.completion.CompletionContextFinder.CompletionContext;
+import org.netbeans.modules.php.editor.completion.CompletionContextFinder.KeywordCompletionType;
+import org.netbeans.modules.php.editor.completion.PHPCompletionItem.CompletionRequest;
+import org.netbeans.modules.php.editor.completion.PHPCompletionItem.FieldItem;
+import org.netbeans.modules.php.editor.completion.PHPCompletionItem.MethodElementItem;
+import org.netbeans.modules.php.editor.completion.PHPCompletionItem.TypeConstantItem;
import org.netbeans.modules.php.editor.PredefinedSymbols;
import org.netbeans.modules.php.editor.api.AliasedName;
import org.netbeans.modules.php.editor.api.ElementQueryFactory;
@@ -80,15 +85,7 @@ import org.netbeans.modules.php.editor.api.elements.PhpElement;
import org.netbeans.modules.php.editor.api.elements.TraitElement;
import org.netbeans.modules.php.editor.api.elements.TypeConstantElement;
import org.netbeans.modules.php.editor.api.elements.TypeElement;
-import org.netbeans.modules.php.editor.api.elements.TypeMemberElement;
import org.netbeans.modules.php.editor.api.elements.VariableElement;
-import org.netbeans.modules.php.editor.completion.CompletionContextFinder.CompletionContext;
-import org.netbeans.modules.php.editor.completion.CompletionContextFinder.KeywordCompletionType;
-import static org.netbeans.modules.php.editor.completion.CompletionContextFinder.lexerToASTOffset;
-import org.netbeans.modules.php.editor.completion.PHPCompletionItem.CompletionRequest;
-import org.netbeans.modules.php.editor.completion.PHPCompletionItem.FieldItem;
-import org.netbeans.modules.php.editor.completion.PHPCompletionItem.MethodElementItem;
-import org.netbeans.modules.php.editor.completion.PHPCompletionItem.TypeConstantItem;
import org.netbeans.modules.php.editor.elements.TypeResolverImpl;
import org.netbeans.modules.php.editor.elements.VariableElementImpl;
import org.netbeans.modules.php.editor.indent.CodeStyle;
@@ -104,6 +101,8 @@ import org.netbeans.modules.php.editor.model.VariableName;
import org.netbeans.modules.php.editor.model.VariableScope;
import org.netbeans.modules.php.editor.model.impl.Type;
import org.netbeans.modules.php.editor.model.impl.VariousUtils;
+import org.netbeans.modules.php.editor.NavUtils;
+import org.netbeans.modules.php.editor.api.elements.TypeMemberElement;
import org.netbeans.modules.php.editor.options.CodeCompletionPanel.VariablesScope;
import org.netbeans.modules.php.editor.options.OptionsUtils;
import org.netbeans.modules.php.editor.parser.PHPParseResult;
@@ -112,9 +111,11 @@ import org.netbeans.modules.php.editor.parser.astnodes.Block;
import org.netbeans.modules.php.editor.parser.astnodes.ClassDeclaration;
import org.netbeans.modules.php.editor.parser.astnodes.ClassInstanceCreation;
import org.netbeans.modules.php.editor.parser.astnodes.Expression;
-import org.netbeans.modules.php.editor.parser.astnodes.TraitDeclaration;
import org.netbeans.modules.php.editor.parser.astnodes.TypeDeclaration;
+import org.netbeans.modules.php.editor.parser.astnodes.TraitDeclaration;
import org.openide.filesystems.FileObject;
+
+import static org.netbeans.modules.php.editor.completion.CompletionContextFinder.lexerToASTOffset;
import org.openide.util.Pair;
/**
@@ -123,8 +124,6 @@ import org.openide.util.Pair;
*/
public class PHPCodeCompletion implements CodeCompletionHandler2 {
- // for unit tests
- static volatile PhpVersion PHP_VERSION = null;
private static final Logger LOGGER = Logger.getLogger(PHPCodeCompletion.class.getName());
private static enum UseType {
@@ -436,9 +435,6 @@ public class PHPCodeCompletion implements CodeCompletionHandler2 {
autoCompleteTypeNames(completionResult, request);
autoCompleteKeywords(completionResult, request, Type.getTypesForReturnType());
break;
- case FIELD_TYPE_NAME:
- autoCompleteFieldType(completionResult, request);
- break;
case STRING:
// LOCAL VARIABLES
completionResult.addAll(getVariableProposals(request, null));
@@ -1019,8 +1015,24 @@ public class PHPCodeCompletion implements CodeCompletionHandler2 {
TokenSequence<PHPTokenId> tokenSequence = th.tokenSequence(PHPTokenId.language());
assert tokenSequence != null;
+ tokenSequence.move(caretOffset);
+ boolean offerMagicAndInherited = true;
+ if (!(!tokenSequence.moveNext() && !tokenSequence.movePrevious())) {
+ Token<PHPTokenId> token = tokenSequence.token();
+ int tokenIdOffset = tokenSequence.token().offset(th);
+ offerMagicAndInherited = !CompletionContextFinder.lineContainsAny(token, caretOffset - tokenIdOffset, tokenSequence, Arrays.asList(new PHPTokenId[]{
+ PHPTokenId.PHP_PRIVATE,
+ PHPTokenId.PHP_PUBLIC,
+ PHPTokenId.PHP_PROTECTED,
+ PHPTokenId.PHP_ABSTRACT,
+ PHPTokenId.PHP_VAR,
+ PHPTokenId.PHP_STATIC,
+ PHPTokenId.PHP_CONST
+ }));
+ }
+
autoCompleteKeywords(completionResult, request, CLASS_CONTEXT_KEYWORD_PROPOSAL);
- if (offerMagicAndInherited(tokenSequence, caretOffset, th)) {
+ if (offerMagicAndInherited) {
EnclosingClass enclosingClass = findEnclosingClass(info, lexerToASTOffset(info, caretOffset));
if (enclosingClass != null) {
List<ElementFilter> superTypeIndices = createTypeFilter(enclosingClass);
@@ -1061,62 +1073,7 @@ public class PHPCodeCompletion implements CodeCompletionHandler2 {
}
}
}
- } else if (completeFieldTypes(tokenSequence, caretOffset, th, info.getSnapshot().getSource().getFileObject())){
- autoCompleteFieldType(completionResult, request);
- }
- }
-
- private void autoCompleteFieldType(final PHPCompletionResult completionResult, CompletionRequest request) {
- // PHP 7.4 Typed Properties 2.0
- // https://wiki.php.net/rfc/typed_properties_v2
- autoCompleteNamespaces(completionResult, request);
- autoCompleteTypeNames(completionResult, request);
- autoCompleteKeywords(completionResult, request, Type.getTypesForFieldType());
- }
-
- private boolean offerMagicAndInherited(TokenSequence<PHPTokenId> tokenSequence, int caretOffset, TokenHierarchy<?> th) {
- boolean offerMagicAndInherited = true;
- tokenSequence.move(caretOffset);
- if (!(!tokenSequence.moveNext() && !tokenSequence.movePrevious())) {
- Token<PHPTokenId> token = tokenSequence.token();
- int tokenIdOffset = tokenSequence.token().offset(th);
- offerMagicAndInherited = !CompletionContextFinder.lineContainsAny(token, caretOffset - tokenIdOffset, tokenSequence, Arrays.asList(new PHPTokenId[]{
- PHPTokenId.PHP_PRIVATE,
- PHPTokenId.PHP_PUBLIC,
- PHPTokenId.PHP_PROTECTED,
- PHPTokenId.PHP_ABSTRACT,
- PHPTokenId.PHP_VAR,
- PHPTokenId.PHP_STATIC,
- PHPTokenId.PHP_CONST
- }));
- }
- return offerMagicAndInherited;
- }
-
- private boolean completeFieldTypes(TokenSequence<PHPTokenId> tokenSequence, int caretOffset, TokenHierarchy<?> th, FileObject fileObject) {
- if (!isPhp74OrNewer(fileObject)) {
- return false;
}
- boolean completeTypes = false;
- tokenSequence.move(caretOffset);
- if (!(!tokenSequence.moveNext() && !tokenSequence.movePrevious())) {
- Token<PHPTokenId> token = tokenSequence.token();
- int tokenIdOffset = tokenSequence.token().offset(th);
- completeTypes = !CompletionContextFinder.lineContainsAny(token, caretOffset - tokenIdOffset, tokenSequence, Arrays.asList(new PHPTokenId[]{
- PHPTokenId.PHP_TYPE_BOOL,
- PHPTokenId.PHP_TYPE_INT,
- PHPTokenId.PHP_TYPE_FLOAT,
- PHPTokenId.PHP_TYPE_STRING,
- PHPTokenId.PHP_ARRAY,
- PHPTokenId.PHP_TYPE_OBJECT,
- PHPTokenId.PHP_ITERABLE,
- PHPTokenId.PHP_SELF,
- PHPTokenId.PHP_PARENT,
- PHPTokenId.PHP_STRING,
- PHPTokenId.PHP_CONST
- }));
- }
- return completeTypes;
}
private static Set<String> toNames(Set<? extends PhpElement> elements) {
@@ -1801,14 +1758,6 @@ public class PHPCodeCompletion implements CodeCompletionHandler2 {
return CodeUtils.isPhpVersionGreaterThan(fileObject, PhpVersion.PHP_5);
}
- private static boolean isPhp74OrNewer(FileObject fileObject) {
- if (PHP_VERSION != null) {
- return PHP_VERSION.compareTo(PhpVersion.PHP_74) >= 0;
- }
- assert fileObject != null;
- return CodeUtils.isPhpVersionGreaterThan(fileObject, PhpVersion.PHP_73);
- }
-
@Override
public String resolveTemplateVariable(String variable, ParserResult info, int caretOffset, String name, Map parameters) {
return null;
diff --git a/php/php.editor/src/org/netbeans/modules/php/editor/elements/FieldElementImpl.java b/php/php.editor/src/org/netbeans/modules/php/editor/elements/FieldElementImpl.java
index 2665eaa..7d7a69d 100644
--- a/php/php.editor/src/org/netbeans/modules/php/editor/elements/FieldElementImpl.java
+++ b/php/php.editor/src/org/netbeans/modules/php/editor/elements/FieldElementImpl.java
@@ -52,7 +52,6 @@ public final class FieldElementImpl extends PhpElementImpl implements FieldEleme
private final TypeElement enclosingType;
private final Set<TypeResolver> instanceTypes;
private final Set<TypeResolver> instanceFQTypes;
- private final boolean isAnnotation;
private FieldElementImpl(
final TypeElement enclosingType,
@@ -63,14 +62,12 @@ public final class FieldElementImpl extends PhpElementImpl implements FieldEleme
final ElementQuery elementQuery,
final Set<TypeResolver> instanceTypes,
final Set<TypeResolver> instanceFQTypes,
- final boolean isDeprecated,
- final boolean isAnnotation) {
+ final boolean isDeprecated) {
super(FieldElementImpl.getName(fieldName, true), enclosingType.getName(), fileUrl, offset, elementQuery, isDeprecated);
this.modifiers = PhpModifiers.fromBitMask(flags);
this.enclosingType = enclosingType;
this.instanceTypes = instanceTypes;
this.instanceFQTypes = instanceFQTypes;
- this.isAnnotation = isAnnotation;
}
public static Set<FieldElement> fromSignature(final TypeElement type,
@@ -100,7 +97,7 @@ public final class FieldElementImpl extends PhpElementImpl implements FieldEleme
if (matchesQuery(query, signParser)) {
retval = new FieldElementImpl(type, signParser.getFieldName(),
signParser.getOffset(), signParser.getFlags(), signParser.getFileUrl(),
- indexScopeQuery, signParser.getTypes(), signParser.getFQTypes(), signParser.isDeprecated(), signParser.isAnnotation());
+ indexScopeQuery, signParser.getTypes(), signParser.getFQTypes(), signParser.isDeprecated());
}
return retval;
@@ -117,7 +114,7 @@ public final class FieldElementImpl extends PhpElementImpl implements FieldEleme
Set<TypeResolver> types = returnType != null ? TypeResolverImpl.parseTypes(returnType) : null;
retval.add(new FieldElementImpl(type, info.getName(), info.getRange().getStart(),
info.getAccessModifiers().toFlags(), fileQuery.getURL().toString(), fileQuery,
- types, types, VariousUtils.isDeprecatedFromPHPDoc(fileQuery.getResult().getProgram(), node), false));
+ types, types, VariousUtils.isDeprecatedFromPHPDoc(fileQuery.getResult().getProgram(), node)));
}
return retval;
}
@@ -138,9 +135,7 @@ public final class FieldElementImpl extends PhpElementImpl implements FieldEleme
fileQuery,
resolvers,
resolvers,
- VariousUtils.isDeprecatedFromPHPDoc(fileQuery.getResult().getProgram(), node),
- false
- );
+ VariousUtils.isDeprecatedFromPHPDoc(fileQuery.getResult().getProgram(), node));
}
static FieldElement fromFrameworks(final TypeElement type, final PhpType.Field field, final ElementQuery elementQuery) {
@@ -152,7 +147,7 @@ public final class FieldElementImpl extends PhpElementImpl implements FieldEleme
? Collections.<TypeResolver>singleton(new TypeResolverImpl(fldType.getFullyQualifiedName(), false))
: Collections.<TypeResolver>emptySet();
FieldElementImpl retval = new FieldElementImpl(type, field.getName(), field.getOffset(),
- PhpModifiers.NO_FLAGS, null, elementQuery, typeResolvers, typeResolvers, false, false);
+ PhpModifiers.NO_FLAGS, null, elementQuery, typeResolvers, typeResolvers, false);
retval.setFileObject(field.getFile());
return retval;
}
@@ -168,18 +163,17 @@ public final class FieldElementImpl extends PhpElementImpl implements FieldEleme
public String getSignature() {
StringBuilder sb = new StringBuilder();
final String noDollarName = getName().substring(1);
- sb.append(noDollarName.toLowerCase()).append(Separator.SEMICOLON);
- sb.append(noDollarName).append(Separator.SEMICOLON);
- sb.append(getOffset()).append(Separator.SEMICOLON);
+ sb.append(noDollarName.toLowerCase()).append(Separator.SEMICOLON); //NOI18N
+ sb.append(noDollarName).append(Separator.SEMICOLON); //NOI18N
+ sb.append(getOffset()).append(Separator.SEMICOLON); //NOI18N
sb.append(getPhpModifiers().toFlags()).append(Separator.SEMICOLON);
for (TypeResolver typeResolver : getInstanceTypes()) {
TypeResolverImpl resolverImpl = (TypeResolverImpl) typeResolver;
sb.append(resolverImpl.getSignature());
}
- sb.append(Separator.SEMICOLON);
+ sb.append(Separator.SEMICOLON); //NOI18N
sb.append(isDeprecated() ? 1 : 0).append(Separator.SEMICOLON);
sb.append(getFilenameUrl()).append(Separator.SEMICOLON);
- sb.append(isAnnotation() ? 1 : 0).append(Separator.SEMICOLON);
checkSignature(sb);
return sb.toString();
}
@@ -220,8 +214,6 @@ public final class FieldElementImpl extends PhpElementImpl implements FieldEleme
assert getPhpModifiers().toFlags() == parser.getFlags();
assert getInstanceTypes().size() == parser.getTypes().size();
assert getInstanceFQTypes().size() == parser.getFQTypes().size();
- assert isDeprecated() == parser.isDeprecated();
- assert isAnnotation() == parser.isAnnotation();
}
}
@@ -268,11 +260,6 @@ public final class FieldElementImpl extends PhpElementImpl implements FieldEleme
return getPhpModifiers().isAbstract();
}
- @Override
- public boolean isAnnotation() {
- return isAnnotation;
- }
-
private static class FieldSignatureParser {
private final Signature signature;
@@ -308,9 +295,5 @@ public final class FieldElementImpl extends PhpElementImpl implements FieldEleme
String getFileUrl() {
return signature.string(7);
}
-
- boolean isAnnotation() {
- return signature.integer(8) == 1;
- }
}
}
diff --git a/php/php.editor/src/org/netbeans/modules/php/editor/indent/FormatVisitor.java b/php/php.editor/src/org/netbeans/modules/php/editor/indent/FormatVisitor.java
index a10d4a0..4465f1b 100644
--- a/php/php.editor/src/org/netbeans/modules/php/editor/indent/FormatVisitor.java
+++ b/php/php.editor/src/org/netbeans/modules/php/editor/indent/FormatVisitor.java
@@ -78,7 +78,6 @@ import org.netbeans.modules.php.editor.parser.astnodes.ParenthesisExpression;
import org.netbeans.modules.php.editor.parser.astnodes.Program;
import org.netbeans.modules.php.editor.parser.astnodes.ReturnStatement;
import org.netbeans.modules.php.editor.parser.astnodes.SingleFieldDeclaration;
-import org.netbeans.modules.php.editor.parser.astnodes.SingleUseStatementPart;
import org.netbeans.modules.php.editor.parser.astnodes.Statement;
import org.netbeans.modules.php.editor.parser.astnodes.StaticFieldAccess;
import org.netbeans.modules.php.editor.parser.astnodes.StaticMethodInvocation;
@@ -90,6 +89,7 @@ import org.netbeans.modules.php.editor.parser.astnodes.TraitDeclaration;
import org.netbeans.modules.php.editor.parser.astnodes.TraitMethodAliasDeclaration;
import org.netbeans.modules.php.editor.parser.astnodes.TryStatement;
import org.netbeans.modules.php.editor.parser.astnodes.UseStatement;
+import org.netbeans.modules.php.editor.parser.astnodes.SingleUseStatementPart;
import org.netbeans.modules.php.editor.parser.astnodes.UseTraitStatement;
import org.netbeans.modules.php.editor.parser.astnodes.UseTraitStatementPart;
import org.netbeans.modules.php.editor.parser.astnodes.Variable;
@@ -991,7 +991,7 @@ public class FormatVisitor extends DefaultVisitor {
includeWSBeforePHPDoc = true;
}
}
- while (ts.moveNext() && !isFieldTypeOrVariableToken(ts.token())) {
+ while (ts.moveNext() && ts.token().id() != PHPTokenId.PHP_VARIABLE) {
addFormatToken(formatTokens);
}
ts.movePrevious();
@@ -2486,24 +2486,6 @@ public class FormatVisitor extends DefaultVisitor {
return true;
}
- private boolean isFieldTypeOrVariableToken(Token<PHPTokenId> token) {
- return PHPTokenId.PHP_VARIABLE == token.id()
- || PHPTokenId.PHP_ARRAY == token.id()
- || PHPTokenId.PHP_ITERABLE == token.id()
- || PHPTokenId.PHP_PARENT == token.id()
- || PHPTokenId.PHP_SELF == token.id()
- || PHPTokenId.PHP_TYPE_BOOL == token.id()
- || PHPTokenId.PHP_TYPE_INT == token.id()
- || PHPTokenId.PHP_TYPE_FLOAT == token.id()
- || PHPTokenId.PHP_TYPE_OBJECT == token.id()
- || PHPTokenId.PHP_TYPE_STRING == token.id()
- || PHPTokenId.PHP_NS_SEPARATOR == token.id() // \
- || (PHPTokenId.PHP_TOKEN == token.id() && TokenUtilities.textEquals(token.text(), "?")) // NOI18N
- || PHPTokenId.PHP_TYPE_VOID == token.id() // not supported type but just check it
- || PHPTokenId.PHP_CALLABLE == token.id() // not supported type but just check it
- ;
- }
-
private interface GroupAlignmentTokenHolder {
void setToken(FormatToken.AssignmentAnchorToken token);
diff --git a/php/php.editor/src/org/netbeans/modules/php/editor/index/PHPIndexer.java b/php/php.editor/src/org/netbeans/modules/php/editor/index/PHPIndexer.java
index 174847b..125f725 100644
--- a/php/php.editor/src/org/netbeans/modules/php/editor/index/PHPIndexer.java
+++ b/php/php.editor/src/org/netbeans/modules/php/editor/index/PHPIndexer.java
@@ -36,8 +36,6 @@ import org.netbeans.modules.parsing.spi.indexing.support.IndexDocument;
import org.netbeans.modules.parsing.spi.indexing.support.IndexingSupport;
import org.netbeans.modules.php.api.util.FileUtils;
import static org.netbeans.modules.php.api.util.FileUtils.PHP_MIME_TYPE;
-import org.netbeans.modules.php.editor.NavUtils;
-import org.netbeans.modules.php.editor.completion.PhpTypeCompletionProviderWrapper.PhpTypeCompletionProvider;
import org.netbeans.modules.php.editor.elements.IndexQueryImpl;
import org.netbeans.modules.php.editor.model.ConstantElement;
import org.netbeans.modules.php.editor.model.FileScope;
@@ -47,6 +45,8 @@ import org.netbeans.modules.php.editor.model.Model.Type;
import org.netbeans.modules.php.editor.model.ModelUtils;
import org.netbeans.modules.php.editor.model.NamespaceScope;
import org.netbeans.modules.php.editor.model.TypeScope;
+import org.netbeans.modules.php.editor.NavUtils;
+import org.netbeans.modules.php.editor.completion.PhpTypeCompletionProviderWrapper.PhpTypeCompletionProvider;
import org.netbeans.modules.php.editor.parser.PHPParseResult;
import org.netbeans.modules.php.editor.parser.astnodes.Identifier;
import org.netbeans.modules.php.editor.parser.astnodes.PHPDocTypeNode;
@@ -216,7 +216,7 @@ public final class PHPIndexer extends EmbeddingIndexer {
public static final class Factory extends EmbeddingIndexerFactory {
public static final String NAME = "php"; // NOI18N
- public static final int VERSION = 29;
+ public static final int VERSION = 28;
@Override
public EmbeddingIndexer createIndexer(final Indexable indexable, final Snapshot snapshot) {
diff --git a/php/php.editor/src/org/netbeans/modules/php/editor/model/FieldElement.java b/php/php.editor/src/org/netbeans/modules/php/editor/model/FieldElement.java
index 016c145..0f8f3d0 100644
--- a/php/php.editor/src/org/netbeans/modules/php/editor/model/FieldElement.java
+++ b/php/php.editor/src/org/netbeans/modules/php/editor/model/FieldElement.java
@@ -16,6 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
+
package org.netbeans.modules.php.editor.model;
import java.util.Collection;
@@ -28,6 +29,4 @@ public interface FieldElement extends ClassMemberElement, TypeAssignments {
Collection<? extends String> getDefaultTypeNames();
- boolean isAnnotation();
-
}
diff --git a/php/php.editor/src/org/netbeans/modules/php/editor/model/impl/FieldElementImpl.java b/php/php.editor/src/org/netbeans/modules/php/editor/model/impl/FieldElementImpl.java
index 610458f..f365d13 100644
--- a/php/php.editor/src/org/netbeans/modules/php/editor/model/impl/FieldElementImpl.java
+++ b/php/php.editor/src/org/netbeans/modules/php/editor/model/impl/FieldElementImpl.java
@@ -54,33 +54,29 @@ class FieldElementImpl extends ScopeImpl implements FieldElement {
String defaultType;
private String defaultFQType;
private String className;
- private final boolean isAnnotation;
- FieldElementImpl(Scope inScope, String defaultType, String defaultFQType, ASTNodeInfo<FieldAccess> nodeInfo, boolean isDeprecated, boolean isAnnotation) {
+ FieldElementImpl(Scope inScope, String defaultType, String defaultFQType, ASTNodeInfo<FieldAccess> nodeInfo, boolean isDeprecated) {
super(inScope, nodeInfo, PhpModifiers.fromBitMask(PhpModifiers.PUBLIC), null, isDeprecated);
this.defaultType = defaultType;
this.defaultFQType = defaultFQType;
assert inScope instanceof TypeScope;
className = inScope.getName();
- this.isAnnotation = isAnnotation;
}
- FieldElementImpl(Scope inScope, String defaultType, String defaultFQType, SingleFieldDeclarationInfo nodeInfo, boolean isDeprecated, boolean isAnnotation) {
+ FieldElementImpl(Scope inScope, String defaultType, String defaultFQType, SingleFieldDeclarationInfo nodeInfo, boolean isDeprecated) {
super(inScope, nodeInfo, nodeInfo.getAccessModifiers(), null, isDeprecated);
this.defaultType = defaultType;
this.defaultFQType = defaultFQType;
assert inScope instanceof TypeScope;
className = inScope.getName();
- this.isAnnotation = isAnnotation;
}
- FieldElementImpl(Scope inScope, String defaultType, String defaultFQType, PhpDocTypeTagInfo nodeInfo, boolean isAnnotation) {
+ FieldElementImpl(Scope inScope, String defaultType, String defaultFQType, PhpDocTypeTagInfo nodeInfo) {
super(inScope, nodeInfo, nodeInfo.getAccessModifiers(), null, inScope.isDeprecated());
this.defaultType = defaultType;
this.defaultFQType = defaultFQType;
assert inScope instanceof TypeScope;
className = inScope.getName();
- this.isAnnotation = isAnnotation;
}
FieldElementImpl(Scope inScope, org.netbeans.modules.php.editor.api.elements.FieldElement indexedConstant) {
@@ -115,7 +111,6 @@ class FieldElementImpl extends ScopeImpl implements FieldElement {
}
}
}
- this.isAnnotation = indexedConstant.isAnnotation();
}
private FieldElementImpl(Scope inScope, String name,
@@ -124,7 +119,6 @@ class FieldElementImpl extends ScopeImpl implements FieldElement {
super(inScope, name, file, offsetRange, PhpElementKind.FIELD, modifiers, isDeprecated);
this.defaultType = defaultType;
this.defaultFQType = defaultType;
- this.isAnnotation = false;
}
@Override
@@ -228,11 +222,6 @@ class FieldElementImpl extends ScopeImpl implements FieldElement {
return retval;
}
- @Override
- public boolean isAnnotation() {
- return isAnnotation;
- }
-
public Collection<? extends FieldAssignmentImpl> getAssignments() {
return filter(getElements(), new ElementFilter() {
@Override
@@ -283,7 +272,6 @@ class FieldElementImpl extends ScopeImpl implements FieldElement {
sb.append(Signature.ITEM_DELIMITER);
sb.append(isDeprecated() ? 1 : 0).append(Signature.ITEM_DELIMITER);
sb.append(getFilenameUrl()).append(Signature.ITEM_DELIMITER);
- sb.append(isAnnotation() ? 1 : 0).append(Signature.ITEM_DELIMITER);
return sb.toString();
}
diff --git a/php/php.editor/src/org/netbeans/modules/php/editor/model/impl/ModelBuilder.java b/php/php.editor/src/org/netbeans/modules/php/editor/model/impl/ModelBuilder.java
index d1ee45c..d0d3ac3 100644
--- a/php/php.editor/src/org/netbeans/modules/php/editor/model/impl/ModelBuilder.java
+++ b/php/php.editor/src/org/netbeans/modules/php/editor/model/impl/ModelBuilder.java
@@ -307,13 +307,10 @@ class ModelBuilder {
}
static FieldElementImpl create(SingleFieldDeclarationInfo nodeInfo, ModelBuilder context) {
- String returnType = nodeInfo.getFieldType();
- if (returnType == null) {
- returnType = VariousUtils.getFieldTypeFromPHPDoc(context.getProgram(), nodeInfo.getOriginalNode());
- }
+ String returnType = VariousUtils.getFieldTypeFromPHPDoc(context.getProgram(), nodeInfo.getOriginalNode());
boolean isDeprecated = VariousUtils.isDeprecatedFromPHPDoc(context.getProgram(), nodeInfo.getOriginalNode());
String returnFQType = VariousUtils.qualifyTypeNames(returnType, nodeInfo.getRange().getStart(), context.getCurrentScope());
- FieldElementImpl fei = new FieldElementImpl(context.getCurrentScope(), returnType, returnFQType, nodeInfo, isDeprecated, false);
+ FieldElementImpl fei = new FieldElementImpl(context.getCurrentScope(), returnType, returnFQType, nodeInfo, isDeprecated);
return fei;
}
diff --git a/php/php.editor/src/org/netbeans/modules/php/editor/model/impl/ModelVisitor.java b/php/php.editor/src/org/netbeans/modules/php/editor/model/impl/ModelVisitor.java
index 3d54256..ca19c71 100644
--- a/php/php.editor/src/org/netbeans/modules/php/editor/model/impl/ModelVisitor.java
+++ b/php/php.editor/src/org/netbeans/modules/php/editor/model/impl/ModelVisitor.java
@@ -120,7 +120,6 @@ import org.netbeans.modules.php.editor.parser.astnodes.ReturnStatement;
import org.netbeans.modules.php.editor.parser.astnodes.Scalar;
import org.netbeans.modules.php.editor.parser.astnodes.Scalar.Type;
import org.netbeans.modules.php.editor.parser.astnodes.SingleFieldDeclaration;
-import org.netbeans.modules.php.editor.parser.astnodes.SingleUseStatementPart;
import org.netbeans.modules.php.editor.parser.astnodes.StaticConstantAccess;
import org.netbeans.modules.php.editor.parser.astnodes.StaticFieldAccess;
import org.netbeans.modules.php.editor.parser.astnodes.StaticMethodInvocation;
@@ -130,6 +129,7 @@ import org.netbeans.modules.php.editor.parser.astnodes.TraitDeclaration;
import org.netbeans.modules.php.editor.parser.astnodes.TraitMethodAliasDeclaration;
import org.netbeans.modules.php.editor.parser.astnodes.TryStatement;
import org.netbeans.modules.php.editor.parser.astnodes.UseStatement;
+import org.netbeans.modules.php.editor.parser.astnodes.SingleUseStatementPart;
import org.netbeans.modules.php.editor.parser.astnodes.UseTraitStatementPart;
import org.netbeans.modules.php.editor.parser.astnodes.Variable;
import org.netbeans.modules.php.editor.parser.astnodes.VariableBase;
@@ -416,11 +416,10 @@ public final class ModelVisitor extends DefaultTreePathVisitor {
if (parent instanceof FunctionName) {
occurencesBuilder.prepare(Kind.FUNCTION, namespaceName, fileScope);
} else if (parent instanceof Program
- || parent instanceof Block
- || parent instanceof FieldsDeclaration) {
+ || parent instanceof Block) {
// return type
Kind[] kinds = {Kind.CLASS, Kind.IFACE};
- occurencesBuilder.prepare(kinds, namespaceName, modelBuilder.getCurrentScope());
+ occurencesBuilder.prepare(kinds, namespaceName, fileScope);
} else if (parent instanceof ClassInstanceCreation) {
if (((ClassInstanceCreation) parent).isAnonymous()) {
// superclass, ifaces
@@ -1047,7 +1046,16 @@ public final class ModelVisitor extends DefaultTreePathVisitor {
}
}
if (parameterName instanceof Variable) {
- prepareType(parameterType, fncScope);
+ if (parameterType instanceof NullableType) {
+ NullableType nullableType = (NullableType) parameterType;
+ if (nullableType.getType() instanceof NamespaceName) {
+ parameterType = (NamespaceName) nullableType.getType();
+ }
+ }
+ if (parameterType instanceof NamespaceName) {
+ Kind[] kinds = {Kind.CLASS, Kind.IFACE};
+ occurencesBuilder.prepare(kinds, (NamespaceName) parameterType, fncScope);
+ }
prepareVariable((Variable) parameterName, fncScope);
}
super.visit(node);
@@ -1248,7 +1256,7 @@ public final class ModelVisitor extends DefaultTreePathVisitor {
sb.append(typeName);
}
if ((currentScope instanceof ClassScope || currentScope instanceof TraitScope) && !it.hasNext()) {
- new FieldElementImpl(currentScope, sb.length() > 0 ? sb.toString() : null, fqNames.length() > 0 ? fqNames.toString() : null, phpDocTypeTagInfo, true);
+ new FieldElementImpl(currentScope, sb.length() > 0 ? sb.toString() : null, fqNames.length() > 0 ? fqNames.toString() : null, phpDocTypeTagInfo);
}
} else if (node.getKind().equals(PHPDocTag.Type.GLOBAL) && phpDocTypeTagInfo.getKind().equals(Kind.VARIABLE)) {
final String typeName = phpDocTypeTagInfo.getTypeName();
@@ -1539,20 +1547,6 @@ public final class ModelVisitor extends DefaultTreePathVisitor {
}
}
- private void prepareType(Expression type, Scope scope) {
- Expression namespaceName = type;
- if (namespaceName instanceof NullableType) {
- NullableType nullableType = (NullableType) namespaceName;
- if (nullableType.getType() instanceof NamespaceName) {
- namespaceName = (NamespaceName) nullableType.getType();
- }
- }
- if (namespaceName instanceof NamespaceName) {
- Kind[] kinds = {Kind.CLASS, Kind.IFACE};
- occurencesBuilder.prepare(kinds, (NamespaceName) namespaceName, scope);
- }
- }
-
void scanNoLazy(ASTNode node, Scope inScope) {
// Remember the old scope. It can happen that will be needed scanned constructor
// in non lazy mode as well.
diff --git a/php/php.editor/src/org/netbeans/modules/php/editor/model/impl/Type.java b/php/php.editor/src/org/netbeans/modules/php/editor/model/impl/Type.java
index d5b06ec..40813cf 100644
--- a/php/php.editor/src/org/netbeans/modules/php/editor/model/impl/Type.java
+++ b/php/php.editor/src/org/netbeans/modules/php/editor/model/impl/Type.java
@@ -48,12 +48,9 @@ public final class Type {
public static final String RESOURCE = "resource"; //NOI18N
public static final String VOID = "void"; //NOI18N
public static final String MIXED = "mixed"; //NOI18N
- public static final String SELF = "self"; //NOI18N
- public static final String PARENT = "parent"; //NOI18N
private static final List<String> TYPES_FOR_EDITOR = Arrays.asList(ARRAY, CALLABLE, ITERABLE, BOOL, FLOAT, INT, STRING, OBJECT);
private static final List<String> TYPES_FOR_RETURN_TYPE = Arrays.asList(ARRAY, CALLABLE, ITERABLE, BOOL, FLOAT, INT, STRING, VOID, OBJECT);
- private static final List<String> TYPES_FOR_FIELD_TYPE = Arrays.asList(ARRAY, ITERABLE, BOOL, FLOAT, INT, STRING, OBJECT, SELF, PARENT); // PHP 7.4 Typed Properties 2.0
private static final List<String> TYPES_FOR_PHP_DOC = Arrays.asList(STRING, INTEGER, INT, BOOLEAN, BOOL, FLOAT, DOUBLE, OBJECT, MIXED, ARRAY,
RESOURCE, VOID, NULL, CALLBACK, CALLABLE, ITERABLE, "false", "true", "self"); // NOI18N
@@ -100,15 +97,6 @@ public final class Type {
return TYPES_FOR_RETURN_TYPE;
}
- /**
- * Get valid types for the field type. This does not contain "void" and "callable".
- *
- * @return valid types for the field type
- */
- public static List<String> getTypesForFieldType() {
- return TYPES_FOR_FIELD_TYPE;
- }
-
public static List<String> getTypesForPhpDoc() {
return TYPES_FOR_PHP_DOC;
}
diff --git a/php/php.editor/src/org/netbeans/modules/php/editor/model/nodes/SingleFieldDeclarationInfo.java b/php/php.editor/src/org/netbeans/modules/php/editor/model/nodes/SingleFieldDeclarationInfo.java
index 744fdbd..e428f57 100644
--- a/php/php.editor/src/org/netbeans/modules/php/editor/model/nodes/SingleFieldDeclarationInfo.java
+++ b/php/php.editor/src/org/netbeans/modules/php/editor/model/nodes/SingleFieldDeclarationInfo.java
@@ -21,11 +21,9 @@ package org.netbeans.modules.php.editor.model.nodes;
import java.util.ArrayList;
import java.util.List;
-import org.netbeans.api.annotations.common.CheckForNull;
import org.netbeans.modules.csl.api.OffsetRange;
import org.netbeans.modules.php.editor.api.PhpModifiers;
import org.netbeans.modules.php.editor.api.QualifiedName;
-import org.netbeans.modules.php.editor.parser.astnodes.Expression;
import org.netbeans.modules.php.editor.parser.astnodes.FieldsDeclaration;
import org.netbeans.modules.php.editor.parser.astnodes.SingleFieldDeclaration;
@@ -69,18 +67,6 @@ public final class SingleFieldDeclarationInfo extends ASTNodeInfo<SingleFieldDec
return PhpModifiers.fromBitMask(fieldsDeclaration.getModifier());
}
- @CheckForNull
- public String getFieldType() {
- Expression fieldType = fieldsDeclaration.getFieldType();
- if (fieldType != null) {
- QualifiedName fieldTypeName = QualifiedName.create(fieldType);
- if (fieldTypeName != null) {
- return fieldTypeName.toString();
- }
- }
- return null;
- }
-
@Override
public QualifiedName getQualifiedName() {
return QualifiedName.createUnqualifiedName(getName());
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 a12193d..610e27c 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
-// Thu Jun 13 22:43:48 JST 2019
+// Sun Apr 07 22:35:32 JST 2019
//----------------------------------------------------
package org.netbeans.modules.php.editor.parser;
@@ -29,7 +29,7 @@ import org.netbeans.modules.php.editor.parser.astnodes.*;
import org.openide.util.Pair;
/** CUP v0.11a beta 20060608 generated parser.
- * @version Thu Jun 13 22:43:48 JST 2019
+ * @version Sun Apr 07 22:35:32 JST 2019
*/
@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 {
@@ -105,7 +105,7 @@ public class ASTPHP5Parser extends java_cup.runtime.lr_parser {
"\213\011\000\002\213\010\000\002\213\007\000\002\146" +
"\004\000\002\146\002\000\002\147\005\000\002\147\013" +
"\000\002\147\003\000\002\144\004\000\002\144\002\000" +
- "\002\145\006\000\002\145\013\000\002\145\003\000\002" +
+ "\002\145\005\000\002\145\013\000\002\145\003\000\002" +
"\145\005\000\002\214\003\000\002\214\004\000\002\214" +
"\004\000\002\215\002\000\002\215\004\000\002\133\003" +
"\000\002\134\002\000\002\134\004\000\002\216\002\000" +
@@ -131,7 +131,7 @@ public class ASTPHP5Parser extends java_cup.runtime.lr_parser {
"\000\002\050\005\000\002\050\003\000\002\051\003\000" +
"\002\051\004\000\002\051\006\000\002\052\005\000\002" +
"\052\007\000\002\052\003\000\002\052\005\000\002\053" +
- "\004\000\002\053\002\000\002\054\006\000\002\054\005" +
+ "\004\000\002\053\002\000\002\054\005\000\002\054\005" +
"\000\002\054\013\000\002\054\003\000\002\054\005\000" +
"\002\135\005\000\002\135\003\000\002\150\003\000\002" +
"\150\004\000\002\136\003\000\002\136\005\000\002\137" +
@@ -272,7 +272,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\u0549\000\006\002\003\012\004\001\001\000\002\001" +
+ "\000\u0547\000\006\002\003\012\004\001\001\000\002\001" +
"\001\000\140\003\174\004\101\013\206\014\200\017\132" +
"\062\167\063\124\064\153\065\051\070\131\074\014\100" +
"\016\101\100\103\165\104\177\105\204\106\063\107\170" +
@@ -282,134 +282,134 @@ public class ASTPHP5Parser extends java_cup.runtime.lr_parser {
"\171\225\116\226\006\230\021\233\134\240\111\243\032" +
"\244\040\245\047\256\055\001\001\000\002\001\001\000" +
"\002\001\001\000\002\001\001\000\002\001\001\000\006" +
- "\050\u053b\051\u053e\001\001\000\112\003\174\004\101\062" +
- "\167\063\124\064\153\065\051\070\131\074\014\100\u0536" +
- "\103\u0537\104\u0538\105\204\106\063\107\170\110\144\121" +
+ "\050\u0539\051\u053c\001\001\000\112\003\174\004\101\062" +
+ "\167\063\124\064\153\065\051\070\131\074\014\100\u0534" +
+ "\103\u0535\104\u0536\105\204\106\063\107\170\110\144\121" +
"\106\131\075\151\130\152\044\153\022\154\137\155\077" +
"\156\057\157\110\161\070\201\025\223\171\225\116\226" +
"\006\230\021\233\134\240\111\243\032\244\040\245\047" +
"\256\055\001\001\000\002\001\001\000\002\001\001\000" +
"\106\003\174\004\101\062\167\063\124\064\153\065\051" +
- "\070\131\074\014\100\u0532\105\204\106\063\107\170\110" +
+ "\070\131\074\014\100\u0530\105\204\106\063\107\170\110" +
"\144\121\106\131\075\151\130\152\044\153\022\154\137" +
"\155\077\156\057\157\110\161\070\201\025\223\171\225" +
"\116\226\006\230\021\233\134\240\111\243\032\244\040" +
"\245\047\256\055\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\u0507\010\u0509\011\u050c\022\u0287\001\001\000\106" +
+ "\012\003\u0505\010\u0507\011\u050a\022\u0287\001\001\000\106" +
"\003\174\004\101\062\167\063\124\064\153\065\051\070" +
- "\131\074\014\100\u0506\105\204\106\063\107\170\110\144" +
+ "\131\074\014\100\u0504\105\204\106\063\107\170\110\144" +
"\121\106\131\075\151\130\152\044\153\022\154\137\155" +
"\077\156\057\157\110\161\070\201\025\223\171\225\116" +
"\226\006\230\021\233\134\240\111\243\032\244\040\245" +
"\047\256\055\001\001\000\106\003\174\004\101\062\167" +
- "\063\124\064\153\065\051\070\131\074\014\100\u0505\105" +
+ "\063\124\064\153\065\051\070\131\074\014\100\u0503\105" +
"\204\106\063\107\170\110\144\121\106\131\075\151\130" +
"\152\044\153\022\154\137\155\077\156\057\157\110\161" +
"\070\201\025\223\171\225\116\226\006\230\021\233\134" +
"\240\111\243\032\244\040\245\047\256\055\001\001\000" +
- "\002\001\001\000\004\112\u030e\001\001\000\002\001\001" +
- "\000\002\001\001\000\004\112\u034d\001\001\000\004\126" +
- "\u04ec\001\001\000\106\003\174\004\101\062\167\063\124" +
- "\064\153\065\051\070\131\074\014\100\u04eb\105\204\106" +
+ "\002\001\001\000\004\112\u030d\001\001\000\002\001\001" +
+ "\000\002\001\001\000\004\112\u034c\001\001\000\004\126" +
+ "\u04ea\001\001\000\106\003\174\004\101\062\167\063\124" +
+ "\064\153\065\051\070\131\074\014\100\u04e9\105\204\106" +
"\063\107\170\110\144\121\106\131\075\151\130\152\044" +
"\153\022\154\137\155\077\156\057\157\110\161\070\201" +
"\025\223\171\225\116\226\006\230\021\233\134\240\111" +
"\243\032\244\040\245\047\256\055\001\001\000\002\001" +
"\001\000\106\003\174\004\101\062\167\063\124\064\153" +
- "\065\051\070\131\074\014\100\u04ea\105\204\106\063\107" +
+ "\065\051\070\131\074\014\100\u04e8\105\204\106\063\107" +
"\170\110\144\121\106\131\075\151\130\152\044\153\022" +
"\154\137\155\077\156\057\157\110\161\070\201\025\223" +
"\171\225\116\226\006\230\021\233\134\240\111\243\032" +
"\244\040\245\047\256\055\001\001\000\002\001\001\000" +
"\002\001\001\000\002\001\001\000\106\003\174\004\101" +
"\062\167\063\124\064\153\065\051\070\131\074\014\100" +
- "\u04c2\105\204\106\063\107\170\110\144\121\106\131\075" +
+ "\u04c0\105\204\106\063\107\170\110\144\121\106\131\075" +
"\151\130\152\044\153\022\154\137\155\077\156\057\157" +
"\110\161\070\201\025\223\171\225\116\226\006\230\021" +
"\233\134\240\111\243\032\244\040\245\047\256\055\001" +
- "\001\000\004\052\u04ba\001\001\000\002\001\001\000\002" +
- "\001\001\000\004\112\u04a4\001\001\000\002\001\001\000" +
+ "\001\000\004\052\u04b8\001\001\000\002\001\001\000\002" +
+ "\001\001\000\004\112\u04a2\001\001\000\002\001\001\000" +
"\002\001\001\000\002\001\001\000\002\001\001\000\002" +
- "\001\001\000\004\112\u0493\001\001\000\116\003\174\004" +
+ "\001\001\000\004\112\u0491\001\001\000\116\003\174\004" +
"\101\062\167\063\124\064\153\065\051\070\131\074\014" +
- "\100\u02f4\105\204\106\063\107\170\110\144\121\106\122" +
- "\u048f\123\u02f5\124\u02f7\125\u02f6\131\075\151\130\152\044" +
+ "\100\u02f3\105\204\106\063\107\170\110\144\121\106\122" +
+ "\u048d\123\u02f4\124\u02f6\125\u02f5\131\075\151\130\152\044" +
"\153\022\154\137\155\077\156\057\157\110\161\070\201" +
"\025\223\171\225\116\226\006\230\021\233\134\240\111" +
"\243\032\244\040\245\047\256\055\001\001\000\054\003" +
"\u0108\064\153\065\051\105\u0105\106\063\107\377\110\144" +
- "\121\106\152\044\155\u0100\156\057\161\u0103\201\u037b\225" +
- "\u048e\226\006\230\021\233\134\243\032\244\040\245\047" +
+ "\121\106\152\044\155\u0100\156\057\161\u0103\201\u037a\225" +
+ "\u048c\226\006\230\021\233\134\243\032\244\040\245\047" +
"\256\055\001\001\000\002\001\001\000\004\112\u0120\001" +
"\001\000\002\001\001\000\106\003\174\004\101\062\167" +
- "\063\124\064\153\065\051\070\131\074\014\100\u048c\105" +
+ "\063\124\064\153\065\051\070\131\074\014\100\u048a\105" +
"\204\106\063\107\170\110\144\121\106\131\075\151\130" +
"\152\044\153\022\154\137\155\077\156\057\157\110\161" +
"\070\201\025\223\171\225\116\226\006\230\021\233\134" +
"\240\111\243\032\244\040\245\047\256\055\001\001\000" +
- "\002\001\001\000\004\126\u0489\001\001\000\002\001\001" +
+ "\002\001\001\000\004\126\u0487\001\001\000\002\001\001" +
"\000\002\001\001\000\002\001\001\000\106\003\174\004" +
"\101\062\167\063\124\064\153\065\051\070\131\074\014" +
- "\100\u0484\105\204\106\063\107\170\110\144\121\106\131" +
+ "\100\u0482\105\204\106\063\107\170\110\144\121\106\131" +
"\075\151\130\152\044\153\022\154\137\155\077\156\057" +
"\157\110\161\070\201\025\223\171\225\116\226\006\230" +
"\021\233\134\240\111\243\032\244\040\245\047\256\055" +
- "\001\001\000\004\015\u0482\001\001\000\002\001\001\000" +
- "\004\003\u0481\001\001\000\004\112\u022f\001\001\000\002" +
- "\001\001\000\004\112\u047f\001\001\000\106\003\174\004" +
+ "\001\001\000\004\015\u0480\001\001\000\002\001\001\000" +
+ "\004\003\u047f\001\001\000\004\112\u022f\001\001\000\002" +
+ "\001\001\000\004\112\u047d\001\001\000\106\003\174\004" +
"\101\062\167\063\124\064\153\065\051\070\131\074\014" +
- "\100\u047e\105\204\106\063\107\170\110\144\121\106\131" +
+ "\100\u047c\105\204\106\063\107\170\110\144\121\106\131" +
"\075\151\130\152\044\153\022\154\137\155\077\156\057" +
"\157\110\161\070\201\025\223\171\225\116\226\006\230" +
"\021\233\134\240\111\243\032\244\040\245\047\256\055" +
"\001\001\000\106\003\174\004\101\062\167\063\124\064" +
- "\153\065\051\070\131\074\014\100\u047d\105\204\106\063" +
+ "\153\065\051\070\131\074\014\100\u047b\105\204\106\063" +
"\107\170\110\144\121\106\131\075\151\130\152\044\153" +
"\022\154\137\155\077\156\057\157\110\161\070\201\025" +
"\223\171\225\116\226\006\230\021\233\134\240\111\243" +
"\032\244\040\245\047\256\055\001\001\000\002\001\001" +
"\000\106\003\174\004\101\062\167\063\124\064\153\065" +
- "\051\070\131\074\014\100\u047a\105\204\106\063\107\170" +
+ "\051\070\131\074\014\100\u0478\105\204\106\063\107\170" +
"\110\144\121\106\131\075\151\130\152\044\153\022\154" +
"\137\155\077\156\057\157\110\161\070\201\025\223\171" +
"\225\116\226\006\230\021\233\134\240\111\243\032\244" +
- "\040\245\047\256\055\001\001\000\010\106\u0479\110\144" +
+ "\040\245\047\256\055\001\001\000\010\106\u0477\110\144" +
"\233\134\001\001\000\106\003\174\004\101\062\167\063" +
- "\124\064\153\065\051\070\131\074\014\100\u0478\105\204" +
+ "\124\064\153\065\051\070\131\074\014\100\u0476\105\204" +
"\106\063\107\170\110\144\121\106\131\075\151\130\152" +
"\044\153\022\154\137\155\077\156\057\157\110\161\070" +
"\201\025\223\171\225\116\226\006\230\021\233\134\240" +
"\111\243\032\244\040\245\047\256\055\001\001\000\002" +
"\001\001\000\002\001\001\000\002\001\001\000\042\003" +
"\320\105\311\106\306\107\302\110\144\121\315\155\303" +
- "\156\057\161\307\230\021\233\134\237\u0476\242\277\243" +
+ "\156\057\161\307\230\021\233\134\237\u0474\242\277\243" +
"\300\244\314\245\301\001\001\000\002\001\001\000\004" +
- "\003\u0466\001\001\000\002\001\001\000\002\001\001\000" +
+ "\003\u0464\001\001\000\002\001\001\000\002\001\001\000" +
"\002\001\001\000\002\001\001\000\106\003\174\004\101" +
"\062\167\063\124\064\153\065\051\070\131\074\014\100" +
- "\u0444\105\204\106\063\107\170\110\144\121\106\131\075" +
+ "\u0442\105\204\106\063\107\170\110\144\121\106\131\075" +
"\151\130\152\044\153\022\154\137\155\077\156\057\157" +
"\110\161\070\201\025\223\171\225\116\226\006\230\021" +
"\233\134\240\111\243\032\244\040\245\047\256\055\001" +
"\001\000\106\003\174\004\101\062\167\063\124\064\153" +
- "\065\051\070\131\074\014\100\u0443\105\204\106\063\107" +
+ "\065\051\070\131\074\014\100\u0441\105\204\106\063\107" +
"\170\110\144\121\106\131\075\151\130\152\044\153\022" +
"\154\137\155\077\156\057\157\110\161\070\201\025\223" +
"\171\225\116\226\006\230\021\233\134\240\111\243\032" +
"\244\040\245\047\256\055\001\001\000\002\001\001\000" +
"\106\003\174\004\101\062\167\063\124\064\153\065\051" +
- "\070\131\074\014\100\u0442\105\204\106\063\107\170\110" +
+ "\070\131\074\014\100\u0440\105\204\106\063\107\170\110" +
"\144\121\106\131\075\151\130\152\044\153\022\154\137" +
"\155\077\156\057\157\110\161\070\201\025\223\171\225" +
"\116\226\006\230\021\233\134\240\111\243\032\244\040" +
"\245\047\256\055\001\001\000\002\001\001\000\004\055" +
- "\u0439\001\001\000\002\001\001\000\002\001\001\000\002" +
- "\001\001\000\004\126\u0421\001\001\000\002\001\001\000" +
- "\002\001\001\000\002\001\001\000\004\112\u0399\001\001" +
+ "\u0437\001\001\000\002\001\001\000\002\001\001\000\002" +
+ "\001\001\000\004\126\u041f\001\001\000\002\001\001\000" +
+ "\002\001\001\000\002\001\001\000\004\112\u0398\001\001" +
"\000\002\001\001\000\002\001\001\000\002\001\001\000" +
- "\120\003\174\004\101\014\u03fa\017\132\062\167\063\124" +
+ "\120\003\174\004\101\014\u03f8\017\132\062\167\063\124" +
"\064\153\065\051\070\131\074\014\100\016\101\100\103" +
"\165\104\177\105\204\106\063\107\170\110\144\121\106" +
"\131\075\151\130\152\044\153\022\154\137\155\077\156" +
@@ -417,51 +417,51 @@ public class ASTPHP5Parser extends java_cup.runtime.lr_parser {
"\230\021\233\134\240\111\243\032\244\040\245\047\256" +
"\055\001\001\000\002\001\001\000\002\001\001\000\106" +
"\003\174\004\101\062\167\063\124\064\153\065\051\070" +
- "\131\074\014\100\u03e1\105\204\106\063\107\170\110\144" +
+ "\131\074\014\100\u03e0\105\204\106\063\107\170\110\144" +
"\121\106\131\075\151\130\152\044\153\022\154\137\155" +
"\077\156\057\157\110\161\070\201\025\223\171\225\116" +
"\226\006\230\021\233\134\240\111\243\032\244\040\245" +
- "\047\256\055\001\001\000\110\003\174\004\101\057\u03dc" +
+ "\047\256\055\001\001\000\110\003\174\004\101\057\u03db" +
"\062\167\063\124\064\153\065\051\070\131\074\014\100" +
- "\u03db\105\204\106\063\107\170\110\144\121\106\131\075" +
+ "\u03da\105\204\106\063\107\170\110\144\121\106\131\075" +
"\151\130\152\044\153\022\154\137\155\077\156\057\157" +
"\110\161\070\201\025\223\171\225\116\226\006\230\021" +
"\233\134\240\111\243\032\244\040\245\047\256\055\001" +
"\001\000\002\001\001\000\106\003\174\004\101\062\167" +
- "\063\124\064\153\065\051\070\131\074\014\100\u03da\105" +
+ "\063\124\064\153\065\051\070\131\074\014\100\u03d9\105" +
"\204\106\063\107\170\110\144\121\106\131\075\151\130" +
"\152\044\153\022\154\137\155\077\156\057\157\110\161" +
"\070\201\025\223\171\225\116\226\006\230\021\233\134" +
"\240\111\243\032\244\040\245\047\256\055\001\001\000" +
"\106\003\174\004\101\062\167\063\124\064\153\065\051" +
- "\070\131\074\014\100\u03d9\105\204\106\063\107\170\110" +
+ "\070\131\074\014\100\u03d8\105\204\106\063\107\170\110" +
"\144\121\106\131\075\151\130\152\044\153\022\154\137" +
"\155\077\156\057\157\110\161\070\201\025\223\171\225" +
"\116\226\006\230\021\233\134\240\111\243\032\244\040" +
"\245\047\256\055\001\001\000\002\001\001\000\002\001" +
- "\001\000\004\112\u039d\001\001\000\002\001\001\000\004" +
- "\112\u03ba\001\001\000\002\001\001\000\106\003\174\004" +
+ "\001\000\004\112\u039c\001\001\000\002\001\001\000\004" +
+ "\112\u03b9\001\001\000\002\001\001\000\106\003\174\004" +
"\101\062\167\063\124\064\153\065\051\070\131\074\014" +
- "\100\u03b9\105\204\106\063\107\170\110\144\121\106\131" +
+ "\100\u03b8\105\204\106\063\107\170\110\144\121\106\131" +
"\075\151\130\152\044\153\022\154\137\155\077\156\057" +
"\157\110\161\070\201\025\223\171\225\116\226\006\230" +
"\021\233\134\240\111\243\032\244\040\245\047\256\055" +
"\001\001\000\002\001\001\000\106\003\174\004\101\062" +
- "\167\063\124\064\153\065\051\070\131\074\014\100\u03b8" +
+ "\167\063\124\064\153\065\051\070\131\074\014\100\u03b7" +
"\105\204\106\063\107\170\110\144\121\106\131\075\151" +
"\130\152\044\153\022\154\137\155\077\156\057\157\110" +
"\161\070\201\025\223\171\225\116\226\006\230\021\233" +
"\134\240\111\243\032\244\040\245\047\256\055\001\001" +
- "\000\004\132\u03b5\001\001\000\002\001\001\000\110\003" +
- "\174\004\101\062\u03af\063\124\064\153\065\051\070\131" +
- "\074\014\100\220\104\u03b0\105\204\106\063\107\170\110" +
+ "\000\004\132\u03b4\001\001\000\002\001\001\000\110\003" +
+ "\174\004\101\062\u03ae\063\124\064\153\065\051\070\131" +
+ "\074\014\100\220\104\u03af\105\204\106\063\107\170\110" +
"\144\121\106\131\075\151\130\152\044\153\022\154\137" +
- "\155\077\156\057\157\110\161\070\201\u03ae\223\171\225" +
+ "\155\077\156\057\157\110\161\070\201\u03ad\223\171\225" +
"\116\226\006\230\021\233\134\240\111\243\032\244\040" +
"\245\047\256\055\001\001\000\002\001\001\000\002\001" +
- "\001\000\002\001\001\000\002\001\001\000\004\066\u03a5" +
+ "\001\000\002\001\001\000\002\001\001\000\004\066\u03a4" +
"\001\001\000\002\001\001\000\106\003\174\004\101\062" +
- "\167\063\124\064\153\065\051\070\131\074\014\100\u03a3" +
+ "\167\063\124\064\153\065\051\070\131\074\014\100\u03a2" +
"\105\204\106\063\107\170\110\144\121\106\131\075\151" +
"\130\152\044\153\022\154\137\155\077\156\057\157\110" +
"\161\070\201\025\223\171\225\116\226\006\230\021\233" +
@@ -469,16 +469,16 @@ public class ASTPHP5Parser extends java_cup.runtime.lr_parser {
"\000\002\001\001\000\002\001\001\000\002\001\001\000" +
"\002\001\001\000\114\003\174\004\101\062\167\063\226" +
"\064\153\065\051\070\131\074\014\100\220\102\222\103" +
- "\u037c\104\u037d\105\204\106\063\107\170\110\144\121\106" +
+ "\u037b\104\u037c\105\204\106\063\107\170\110\144\121\106" +
"\131\075\151\130\152\044\153\022\154\137\155\077\156" +
"\057\157\223\161\070\201\221\223\227\225\116\226\006" +
"\230\021\233\134\240\111\243\032\244\040\245\047\256" +
"\055\001\001\000\054\003\u0108\064\153\065\051\105\u0105" +
"\106\063\107\377\110\144\121\106\152\044\155\u0100\156" +
- "\057\161\u0103\201\u037b\225\u037a\226\006\230\021\233\134" +
+ "\057\161\u0103\201\u037a\225\u0379\226\006\230\021\233\134" +
"\243\032\244\040\245\047\256\055\001\001\000\004\112" +
"\u0114\001\001\000\106\003\174\004\101\062\167\063\124" +
- "\064\153\065\051\070\131\074\014\100\u0378\105\204\106" +
+ "\064\153\065\051\070\131\074\014\100\u0377\105\204\106" +
"\063\107\170\110\144\121\106\131\075\151\130\152\044" +
"\153\022\154\137\155\077\156\057\157\110\161\070\201" +
"\025\223\171\225\116\226\006\230\021\233\134\240\111" +
@@ -489,8 +489,8 @@ public class ASTPHP5Parser extends java_cup.runtime.lr_parser {
"\131\075\151\130\152\044\153\022\154\137\155\077\156" +
"\057\157\110\161\070\201\025\223\171\225\116\226\006" +
"\230\021\233\134\240\111\243\032\244\040\245\047\256" +
- "\055\001\001\000\002\001\001\000\004\112\u034d\001\001" +
- "\000\002\001\001\000\002\001\001\000\004\055\u032d\001" +
+ "\055\001\001\000\002\001\001\000\004\112\u034c\001\001" +
+ "\000\002\001\001\000\002\001\001\000\004\055\u032c\001" +
"\001\000\110\003\174\004\101\062\167\063\226\064\153" +
"\065\051\070\131\074\014\100\220\102\222\105\204\106" +
"\063\107\170\110\144\121\106\131\075\151\130\152\044" +
@@ -499,7 +499,7 @@ public class ASTPHP5Parser extends java_cup.runtime.lr_parser {
"\243\032\244\040\245\047\256\055\001\001\000\002\001" +
"\001\000\002\001\001\000\002\001\001\000\002\001\001" +
"\000\042\003\320\105\311\106\306\107\302\110\144\121" +
- "\315\155\303\156\057\161\307\230\021\233\134\237\u0327" +
+ "\315\155\303\156\057\161\307\230\021\233\134\237\u0326" +
"\242\277\243\300\244\314\245\301\001\001\000\106\003" +
"\174\004\101\062\167\063\124\064\153\065\051\070\131" +
"\074\014\100\230\105\204\106\063\107\170\110\144\121" +
@@ -508,113 +508,113 @@ public class ASTPHP5Parser extends java_cup.runtime.lr_parser {
"\006\230\021\233\134\240\111\243\032\244\040\245\047" +
"\256\055\001\001\000\002\001\001\000\002\001\001\000" +
"\002\001\001\000\106\003\174\004\101\062\167\063\124" +
- "\064\153\065\051\070\131\074\014\100\u0326\105\204\106" +
+ "\064\153\065\051\070\131\074\014\100\u0325\105\204\106" +
"\063\107\170\110\144\121\106\131\075\151\130\152\044" +
"\153\022\154\137\155\077\156\057\157\110\161\070\201" +
"\025\223\171\225\116\226\006\230\021\233\134\240\111" +
"\243\032\244\040\245\047\256\055\001\001\000\106\003" +
"\174\004\101\062\167\063\124\064\153\065\051\070\131" +
- "\074\014\100\u0325\105\204\106\063\107\170\110\144\121" +
+ "\074\014\100\u0324\105\204\106\063\107\170\110\144\121" +
"\106\131\075\151\130\152\044\153\022\154\137\155\077" +
"\156\057\157\110\161\070\201\025\223\171\225\116\226" +
"\006\230\021\233\134\240\111\243\032\244\040\245\047" +
"\256\055\001\001\000\106\003\174\004\101\062\167\063" +
- "\124\064\153\065\051\070\131\074\014\100\u0324\105\204" +
+ "\124\064\153\065\051\070\131\074\014\100\u0323\105\204" +
"\106\063\107\170\110\144\121\106\131\075\151\130\152" +
"\044\153\022\154\137\155\077\156\057\157\110\161\070" +
"\201\025\223\171\225\116\226\006\230\021\233\134\240" +
"\111\243\032\244\040\245\047\256\055\001\001\000\106" +
"\003\174\004\101\062\167\063\124\064\153\065\051\070" +
- "\131\074\014\100\u0323\105\204\106\063\107\170\110\144" +
+ "\131\074\014\100\u0322\105\204\106\063\107\170\110\144" +
"\121\106\131\075\151\130\152\044\153\022\154\137\155" +
"\077\156\057\157\110\161\070\201\025\223\171\225\116" +
"\226\006\230\021\233\134\240\111\243\032\244\040\245" +
"\047\256\055\001\001\000\106\003\174\004\101\062\167" +
- "\063\124\064\153\065\051\070\131\074\014\100\u0322\105" +
+ "\063\124\064\153\065\051\070\131\074\014\100\u0321\105" +
"\204\106\063\107\170\110\144\121\106\131\075\151\130" +
"\152\044\153\022\154\137\155\077\156\057\157\110\161" +
"\070\201\025\223\171\225\116\226\006\230\021\233\134" +
"\240\111\243\032\244\040\245\047\256\055\001\001\000" +
"\106\003\174\004\101\062\167\063\124\064\153\065\051" +
- "\070\131\074\014\100\u0321\105\204\106\063\107\170\110" +
+ "\070\131\074\014\100\u0320\105\204\106\063\107\170\110" +
"\144\121\106\131\075\151\130\152\044\153\022\154\137" +
"\155\077\156\057\157\110\161\070\201\025\223\171\225" +
"\116\226\006\230\021\233\134\240\111\243\032\244\040" +
"\245\047\256\055\001\001\000\106\003\174\004\101\062" +
- "\167\063\124\064\153\065\051\070\131\074\014\100\u0320" +
+ "\167\063\124\064\153\065\051\070\131\074\014\100\u031f" +
"\105\204\106\063\107\170\110\144\121\106\131\075\151" +
"\130\152\044\153\022\154\137\155\077\156\057\157\110" +
"\161\070\201\025\223\171\225\116\226\006\230\021\233" +
"\134\240\111\243\032\244\040\245\047\256\055\001\001" +
"\000\106\003\174\004\101\062\167\063\124\064\153\065" +
- "\051\070\131\074\014\100\u031f\105\204\106\063\107\170" +
+ "\051\070\131\074\014\100\u031e\105\204\106\063\107\170" +
"\110\144\121\106\131\075\151\130\152\044\153\022\154" +
"\137\155\077\156\057\157\110\161\070\201\025\223\171" +
"\225\116\226\006\230\021\233\134\240\111\243\032\244" +
"\040\245\047\256\055\001\001\000\106\003\174\004\101" +
"\062\167\063\124\064\153\065\051\070\131\074\014\100" +
- "\u031a\105\204\106\063\107\170\110\144\121\106\131\075" +
+ "\u0319\105\204\106\063\107\170\110\144\121\106\131\075" +
"\151\130\152\044\153\022\154\137\155\077\156\057\157" +
"\110\161\070\201\025\223\171\225\116\226\006\230\021" +
"\233\134\240\111\243\032\244\040\245\047\256\055\001" +
"\001\000\106\003\174\004\101\062\167\063\124\064\153" +
- "\065\051\070\131\074\014\100\u0319\105\204\106\063\107" +
+ "\065\051\070\131\074\014\100\u0318\105\204\106\063\107" +
"\170\110\144\121\106\131\075\151\130\152\044\153\022" +
"\154\137\155\077\156\057\157\110\161\070\201\025\223" +
"\171\225\116\226\006\230\021\233\134\240\111\243\032" +
"\244\040\245\047\256\055\001\001\000\106\003\174\004" +
"\101\062\167\063\124\064\153\065\051\070\131\074\014" +
- "\100\u0318\105\204\106\063\107\170\110\144\121\106\131" +
+ "\100\u0317\105\204\106\063\107\170\110\144\121\106\131" +
"\075\151\130\152\044\153\022\154\137\155\077\156\057" +
"\157\110\161\070\201\025\223\171\225\116\226\006\230" +
"\021\233\134\240\111\243\032\244\040\245\047\256\055" +
"\001\001\000\106\003\174\004\101\062\167\063\124\064" +
- "\153\065\051\070\131\074\014\100\u0317\105\204\106\063" +
+ "\153\065\051\070\131\074\014\100\u0316\105\204\106\063" +
"\107\170\110\144\121\106\131\075\151\130\152\044\153" +
"\022\154\137\155\077\156\057\157\110\161\070\201\025" +
"\223\171\225\116\226\006\230\021\233\134\240\111\243" +
"\032\244\040\245\047\256\055\001\001\000\106\003\174" +
"\004\101\062\167\063\124\064\153\065\051\070\131\074" +
- "\014\100\u0316\105\204\106\063\107\170\110\144\121\106" +
+ "\014\100\u0315\105\204\106\063\107\170\110\144\121\106" +
"\131\075\151\130\152\044\153\022\154\137\155\077\156" +
"\057\157\110\161\070\201\025\223\171\225\116\226\006" +
"\230\021\233\134\240\111\243\032\244\040\245\047\256" +
"\055\001\001\000\106\003\174\004\101\062\167\063\124" +
- "\064\153\065\051\070\131\074\014\100\u0315\105\204\106" +
+ "\064\153\065\051\070\131\074\014\100\u0314\105\204\106" +
"\063\107\170\110\144\121\106\131\075\151\130\152\044" +
"\153\022\154\137\155\077\156\057\157\110\161\070\201" +
"\025\223\171\225\116\226\006\230\021\233\134\240\111" +
"\243\032\244\040\245\047\256\055\001\001\000\106\003" +
"\174\004\101\062\167\063\124\064\153\065\051\070\131" +
- "\074\014\100\u0314\105\204\106\063\107\170\110\144\121" +
+ "\074\014\100\u0313\105\204\106\063\107\170\110\144\121" +
"\106\131\075\151\130\152\044\153\022\154\137\155\077" +
"\156\057\157\110\161\070\201\025\223\171\225\116\226" +
"\006\230\021\233\134\240\111\243\032\244\040\245\047" +
"\256\055\001\001\000\106\003\174\004\101\062\167\063" +
- "\124\064\153\065\051\070\131\074\014\100\u0313\105\204" +
+ "\124\064\153\065\051\070\131\074\014\100\u0312\105\204" +
"\106\063\107\170\110\144\121\106\131\075\151\130\152" +
"\044\153\022\154\137\155\077\156\057\157\110\161\070" +
"\201\025\223\171\225\116\226\006\230\021\233\134\240" +
"\111\243\032\244\040\245\047\256\055\001\001\000\106" +
"\003\174\004\101\062\167\063\124\064\153\065\051\070" +
- "\131\074\014\100\u0312\105\204\106\063\107\170\110\144" +
+ "\131\074\014\100\u0311\105\204\106\063\107\170\110\144" +
"\121\106\131\075\151\130\152\044\153\022\154\137\155" +
"\077\156\057\157\110\161\070\201\025\223\171\225\116" +
"\226\006\230\021\233\134\240\111\243\032\244\040\245" +
"\047\256\055\001\001\000\106\003\174\004\101\062\167" +
- "\063\124\064\153\065\051\070\131\074\014\100\u0311\105" +
+ "\063\124\064\153\065\051\070\131\074\014\100\u0310\105" +
"\204\106\063\107\170\110\144\121\106\131\075\151\130" +
"\152\044\153\022\154\137\155\077\156\057\157\110\161" +
"\070\201\025\223\171\225\116\226\006\230\021\233\134" +
"\240\111\243\032\244\040\245\047\256\055\001\001\000" +
"\002\001\001\000\106\003\174\004\101\062\167\063\124" +
- "\064\153\065\051\070\131\074\014\100\u0310\105\204\106" +
+ "\064\153\065\051\070\131\074\014\100\u030f\105\204\106" +
"\063\107\170\110\144\121\106\131\075\151\130\152\044" +
"\153\022\154\137\155\077\156\057\157\110\161\070\201" +
"\025\223\171\225\116\226\006\230\021\233\134\240\111" +
"\243\032\244\040\245\047\256\055\001\001\000\106\003" +
"\174\004\101\062\167\063\124\064\153\065\051\070\131" +
- "\074\014\100\u030f\105\204\106\063\107\170\110\144\121" +
+ "\074\014\100\u030e\105\204\106\063\107\170\110\144\121" +
"\106\131\075\151\130\152\044\153\022\154\137\155\077" +
"\156\057\157\110\161\070\201\025\223\171\225\116\226" +
"\006\230\021\233\134\240\111\243\032\244\040\245\047" +
@@ -668,18 +668,18 @@ public class ASTPHP5Parser extends java_cup.runtime.lr_parser {
"\047\256\055\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\112\u030e\001\001\000\002\001\001\000" +
- "\002\001\001\000\004\112\u022f\001\001\000\004\003\u030b" +
+ "\001\001\000\004\112\u030d\001\001\000\002\001\001\000" +
+ "\002\001\001\000\004\112\u022f\001\001\000\004\003\u030a" +
"\001\001\000\116\003\174\004\101\062\167\063\124\064" +
- "\153\065\051\070\131\074\014\100\u02f4\105\204\106\063" +
- "\107\170\110\144\121\106\122\u02f8\123\u02f5\124\u02f7\125" +
- "\u02f6\131\075\151\130\152\044\153\022\154\137\155\077" +
+ "\153\065\051\070\131\074\014\100\u02f3\105\204\106\063" +
+ "\107\170\110\144\121\106\122\u02f7\123\u02f4\124\u02f6\125" +
+ "\u02f5\131\075\151\130\152\044\153\022\154\137\155\077" +
"\156\057\157\110\161\070\201\025\223\171\225\116\226" +
"\006\230\021\233\134\240\111\243\032\244\040\245\047" +
"\256\055\001\001\000\004\112\u0120\001\001\000\002\001" +
"\001\000\002\001\001\000\004\112\u0114\001\001\000\002" +
"\001\001\000\002\001\001\000\002\001\001\000\010\106" +
- "\u02ea\110\144\233\134\001\001\000\110\003\174\004\101" +
+ "\u02e9\110\144\233\134\001\001\000\110\003\174\004\101" +
"\062\167\063\226\064\153\065\051\070\131\074\014\100" +
"\220\102\222\105\204\106\063\107\170\110\144\121\106" +
"\131\075\151\130\152\044\153\022\154\137\155\077\156" +
@@ -1035,7 +1035,7 @@ public class ASTPHP5Parser extends java_cup.runtime.lr_parser {
"\233\134\240\111\243\032\244\040\245\047\256\055\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\215\u024c\001\001\000\006\003\u0253\162\u02e8\001\001" +
+ "\004\215\u024c\001\001\000\006\003\u0253\162\u02e7\001\001" +
"\000\004\216\u024d\001\001\000\002\001\001\000\010\003" +
"\u0253\162\u0251\217\u0250\001\001\000\004\003\u0258\001\001" +
"\000\002\001\001\000\002\001\001\000\002\001\001\000" +
@@ -1043,252 +1043,154 @@ public class ASTPHP5Parser extends java_cup.runtime.lr_parser {
"\000\006\003\u0253\162\u0257\001\001\000\002\001\001\000" +
"\002\001\001\000\004\053\u025a\001\001\000\020\054\u025d" +
"\172\u025c\173\u026b\224\u0265\234\u0268\235\u025b\236\u0267\001" +
- "\001\000\006\234\u02e5\236\u02e4\001\001\000\004\170\u02db" +
+ "\001\000\006\234\u02e4\236\u02e3\001\001\000\004\170\u02da" +
"\001\001\000\002\001\001\000\002\001\001\000\002\001" +
- "\001\000\010\003\u02b2\135\u02af\150\u02b1\001\001\000\002" +
- "\001\001\000\002\001\001\000\002\001\001\000\002\001" +
- "\001\000\012\003\u0253\162\u0276\220\u02a5\221\u0279\001\001" +
- "\000\002\001\001\000\006\234\u02a1\235\u02a2\001\001\000" +
- "\006\235\u029e\236\u029d\001\001\000\002\001\001\000\002" +
- "\001\001\000\002\001\001\000\004\055\u026e\001\001\000" +
- "\002\001\001\000\012\164\u017e\165\u0182\166\u0172\167\u026f" +
- "\001\001\000\002\001\001\000\020\003\u0253\041\u0278\044" +
- "\u0273\045\u0277\162\u0276\220\u0272\221\u0279\001\001\000\002" +
- "\001\001\000\004\056\u0294\001\001\000\002\001\001\000" +
- "\002\001\001\000\010\003\u0253\162\u0276\221\u0290\001\001" +
- "\000\002\001\001\000\002\001\001\000\002\001\001\000" +
- "\002\001\001\000\004\222\u027c\001\001\000\010\003\u0253" +
- "\162\u0276\221\u028e\001\001\000\004\174\u027d\001\001\000" +
- "\002\001\001\000\004\015\u0280\001\001\000\002\001\001" +
- "\000\136\003\174\004\101\014\u0286\016\u0281\017\132\062" +
- "\167\063\124\064\153\065\051\070\131\074\014\100\016" +
- "\101\100\103\165\104\177\105\204\106\063\107\170\110" +
- "\144\121\106\131\075\133\135\151\130\152\044\153\022" +
- "\154\137\155\077\156\057\157\110\161\070\177\u0283\200" +
- "\u0285\201\025\212\162\213\023\214\053\223\171\225\116" +
- "\226\006\230\021\233\134\240\111\243\032\244\040\245" +
- "\047\256\055\001\001\000\002\001\001\000\004\022\u0287" +
+ "\001\000\010\003\u02b1\135\u02ae\150\u02b0\001\001\000\002" +
"\001\001\000\002\001\001\000\002\001\001\000\002\001" +
+ "\001\000\004\163\u02a6\001\001\000\002\001\001\000\006" +
+ "\234\u02a1\235\u02a2\001\001\000\006\235\u029e\236\u029d\001" +
"\001\000\002\001\001\000\002\001\001\000\002\001\001" +
+ "\000\004\055\u026e\001\001\000\002\001\001\000\012\164" +
+ "\u017e\165\u0182\166\u0172\167\u026f\001\001\000\002\001\001" +
+ "\000\020\003\u0253\041\u0278\044\u0273\045\u0277\162\u0276\220" +
+ "\u0272\221\u0279\001\001\000\002\001\001\000\004\056\u0294" +
+ "\001\001\000\002\001\001\000\002\001\001\000\010\003" +
+ "\u0253\162\u0276\221\u0290\001\001\000\002\001\001\000\002" +
+ "\001\001\000\002\001\001\000\002\001\001\000\004\222" +
+ "\u027c\001\001\000\010\003\u0253\162\u0276\221\u028e\001\001" +
+ "\000\004\174\u027d\001\001\000\002\001\001\000\004\015" +
+ "\u0280\001\001\000\002\001\001\000\136\003\174\004\101" +
+ "\014\u0286\016\u0281\017\132\062\167\063\124\064\153\065" +
+ "\051\070\131\074\014\100\016\101\100\103\165\104\177" +
+ "\105\204\106\063\107\170\110\144\121\106\131\075\133" +
+ "\135\151\130\152\044\153\022\154\137\155\077\156\057" +
+ "\157\110\161\070\177\u0283\200\u0285\201\025\212\162\213" +
+ "\023\214\053\223\171\225\116\226\006\230\021\233\134" +
+ "\240\111\243\032\244\040\245\047\256\055\001\001\000" +
+ "\002\001\001\000\004\022\u0287\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\u0253\162\u0276\221\u028f\001\001" +
- "\000\002\001\001\000\002\001\001\000\002\001\001\000" +
- "\014\003\u0253\045\u0292\162\u0276\220\u0272\221\u0279\001\001" +
- "\000\002\001\001\000\002\001\001\000\002\001\001\000" +
- "\002\001\001\000\032\003\u01a0\004\u0197\070\u018f\071\u0297" +
- "\072\u01e9\073\u019b\151\u019d\161\u018b\250\u0195\252\u018c\253" +
- "\u0191\255\u019f\001\001\000\002\001\001\000\002\001\001" +
- "\000\002\001\001\000\032\003\u01a0\004\u0197\070\u018f\071" +
- "\u029b\072\u01e9\073\u019b\151\u019d\161\u018b\250\u0195\252\u018c" +
- "\253\u0191\255\u019f\001\001\000\002\001\001\000\002\001" +
- "\001\000\004\235\u02a0\001\001\000\004\236\u029f\001\001" +
- "\000\002\001\001\000\002\001\001\000\004\235\u02a4\001" +
- "\001\000\004\234\u02a3\001\001\000\002\001\001\000\002" +
- "\001\001\000\004\163\u02a7\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\u01a0\004\u0197\070\u018f\071\u02ac\072" +
- "\u01e9\073\u019b\151\u019d\161\u018b\250\u0195\252\u018c\253\u0191" +
- "\255\u019f\001\001\000\002\001\001\000\032\003\u01a0\004" +
- "\u0197\070\u018f\071\u02ae\072\u01e9\073\u019b\151\u019d\161\u018b" +
- "\250\u0195\252\u018c\253\u0191\255\u019f\001\001\000\002\001" +
- "\001\000\004\136\u02b6\001\001\000\004\003\u02b3\001\001" +
+ "\001\001\000\002\001\001\000\002\001\001\000\010\003" +
+ "\u0253\162\u0276\221\u028f\001\001\000\002\001\001\000\002" +
+ "\001\001\000\002\001\001\000\014\003\u0253\045\u0292\162" +
+ "\u0276\220\u0272\221\u0279\001\001\000\002\001\001\000\002" +
+ "\001\001\000\002\001\001\000\002\001\001\000\032\003" +
+ "\u01a0\004\u0197\070\u018f\071\u0297\072\u01e9\073\u019b\151\u019d" +
+ "\161\u018b\250\u0195\252\u018c\253\u0191\255\u019f\001\001\000" +
+ "\002\001\001\000\002\001\001\000\002\001\001\000\032" +
+ "\003\u01a0\004\u0197\070\u018f\071\u029b\072\u01e9\073\u019b\151" +
+ "\u019d\161\u018b\250\u0195\252\u018c\253\u0191\255\u019f\001\001" +
+ "\000\002\001\001\000\002\001\001\000\004\235\u02a0\001" +
+ "\001\000\004\236\u029f\001\001\000\002\001\001\000\002" +
+ "\001\001\000\004\235\u02a4\001\001\000\004\234\u02a3\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" +
- "\006\003\u02b2\150\u02d9\001\001\000\004\137\u02b8\001\001" +
- "\000\002\001\001\000\002\001\001\000\016\003\320\132" +
- "\u02ba\140\u02bb\141\u02b9\142\u02be\161\u02bc\001\001\000\002" +
- "\001\001\000\002\001\001\000\002\001\001\000\002\001" +
+ "\002\001\001\000\032\003\u01a0\004\u0197\070\u018f\071\u02ab" +
+ "\072\u01e9\073\u019b\151\u019d\161\u018b\250\u0195\252\u018c\253" +
+ "\u0191\255\u019f\001\001\000\002\001\001\000\032\003\u01a0" +
+ "\004\u0197\070\u018f\071\u02ad\072\u01e9\073\u019b\151\u019d\161" +
+ "\u018b\250\u0195\252\u018c\253\u0191\255\u019f\001\001\000\002" +
+ "\001\001\000\004\136\u02b5\001\001\000\004\003\u02b2\001" +
"\001\000\002\001\001\000\002\001\001\000\002\001\001" +
- "\000\002\001\001\000\004\132\u02c2\001\001\000\002\001" +
- "\001\000\010\003\320\161\u02ce\257\u02cd\001\001\000\006" +
- "\132\u02c7\143\u02c5\001\001\000\004\132\u02cb\001\001\000" +
+ "\000\006\003\u02b1\150\u02d8\001\001\000\004\137\u02b7\001" +
+ "\001\000\002\001\001\000\002\001\001\000\016\003\320" +
+ "\132\u02b9\140\u02ba\141\u02b8\142\u02bd\161\u02bb\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\006\003\320" +
- "\161\u02d1\001\001\000\002\001\001\000\002\001\001\000" +
- "\006\132\u02d4\143\u02d3\001\001\000\004\132\u02d6\001\001" +
+ "\001\000\002\001\001\000\004\132\u02c1\001\001\000\002" +
+ "\001\001\000\010\003\320\161\u02cd\257\u02cc\001\001\000" +
+ "\006\132\u02c6\143\u02c4\001\001\000\004\132\u02ca\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" +
- "\164\u017e\165\u0182\166\u02e1\001\001\000\002\001\001\000" +
- "\010\164\u017e\165\u0182\166\u02de\001\001\000\002\001\001" +
- "\000\002\001\001\000\030\003\u01a0\004\u0197\070\u018f\072" +
- "\u02e0\073\u019b\151\u019d\161\u018b\250\u0195\252\u018c\253\u0191" +
- "\255\u019f\001\001\000\002\001\001\000\002\001\001\000" +
- "\030\003\u01a0\004\u0197\070\u018f\072\u02e3\073\u019b\151\u019d" +
- "\161\u018b\250\u0195\252\u018c\253\u0191\255\u019f\001\001\000" +
- "\002\001\001\000\004\234\u02e7\001\001\000\004\236\u02e6" +
- "\001\001\000\002\001\001\000\002\001\001\000\002\001" +
- "\001\000\002\001\001\000\004\112\u0120\001\001\000\024" +
- "\106\u011f\110\144\116\u02ec\117\u011a\120\u0117\121\u011b\132" +
- "\u0116\226\u0118\233\134\001\001\000\004\246\u02ed\001\001" +
- "\000\004\247\u02ee\001\001\000\002\001\001\000\024\106" +
- "\u011f\110\144\116\u02f0\117\u011a\120\u0117\121\u011b\132\u0116" +
- "\226\u0118\233\134\001\001\000\002\001\001\000\014\106" +
- "\u011f\110\144\121\u011b\226\u02f2\233\134\001\001\000\002" +
- "\001\001\000\054\003\u0108\064\153\065\051\105\u0105\106" +
- "\063\107\377\110\144\121\106\152\044\155\u0100\156\057" +
- "\160\u030a\161\u0103\201\u0247\226\006\230\021\233\134\243" +
- "\032\244\040\245\047\256\055\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\174\004\101" +
- "\062\167\063\124\064\153\065\051\070\131\074\014\100" +
- "\u02f4\105\204\106\063\107\170\110\144\121\106\122\u02fb" +
- "\123\u02f5\124\u02f7\125\u02f6\131\075\151\130\152\044\153" +
- "\022\154\137\155\077\156\057\157\110\161\070\201\025" +
- "\223\171\225\116\226\006\230\021\233\134\240\111\243" +
- "\032\244\040\245\047\256\055\001\001\000\002\001\001" +
- "\000\002\001\001\000\106\003\174\004\101\062\167\063" +
- "\124\064\153\065\051\070\131\074\014\100\u02fe\105\204" +
- "\106\063\107\170\110\144\121\106\131\075\151\130\152" +
- "\044\153\022\154\137\155\077\156\057\157\110\161\070" +
- "\201\025\223\171\225\116\226\006\230\021\233\134\240" +
- "\111\243\032\244\040\245\047\256\055\001\001\000\002" +
- "\001\001\000\002\001\001\000\112\003\174\004\101\062" +
- "\167\063\124\064\153\065\051\070\131\074\014\100\u02f4" +
- "\105\204\106\063\107\170\110\144\121\106\123\u0301\124" +
- "\u02f7\131\075\151\130\152\044\153\022\154\137\155\077" +
- "\156\057\157\110\161\070\201\025\223\171\225\116\226" +
- "\006\230\021\233\134\240\111\243\032\244\040\245\047" +
- "\256\055\001\001\000\002\001\001\000\106\003\174\004" +
- "\101\062\167\063\124\064\153\065\051\070\131\074\014" +
- "\100\u0304\105\204\106\063\107\170\110\144\121\106\131" +
- "\075\151\130\152\044\153\022\154\137\155\077\156\057" +
- "\157\110\161\070\201\025\223\171\225\116\226\006\230" +
- "\021\233\134\240\111\243\032\244\040\245\047\256\055" +
- "\001\001\000\054\003\u0108\064\153\065\051\105\u0105\106" +
- "\063\107\377\110\144\121\106\152\044\155\u0100\156\057" +
- "\160\u0309\161\u0103\201\u0247\226\006\230\021\233\134\243" +
- "\032\244\040\245\047\256\055\001\001\000\002\001\001" +
- "\000\002\001\001\000\116\003\174\004\101\062\167\063" +
- "\124\064\153\065\051\070\131\074\014\100\u02f4\105\204" +
- "\106\063\107\170\110\144\121\106\122\u0307\123\u02f5\124" +
- "\u02f7\125\u02f6\131\075\151\130\152\044\153\022\154\137" +
- "\155\077\156\057\157\110\161\070\201\025\223\171\225" +
- "\116\226\006\230\021\233\134\240\111\243\032\244\040" +
- "\245\047\256\055\001\001\000\002\001\001\000\002\001" +
- "\001\000\002\001\001\000\002\001\001\000\002\001\001" +
- "\000\014\106\u011f\110\144\121\u011b\226\u030d\233\134\001" +
+ "\002\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" +
+ "\320\161\u02d0\001\001\000\002\001\001\000\002\001\001" +
+ "\000\006\132\u02d3\143\u02d2\001\001\000\004\132\u02d5\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" +
+ "\010\164\u017e\165\u0182\166\u02e0\001\001\000\002\001\001" +
+ "\000\010\164\u017e\165\u0182\166\u02dd\001\001\000\002\001" +
+ "\001\000\002\001\001\000\030\003\u01a0\004\u0197\070\u018f" +
+ "\072\u02df\073\u019b\151\u019d\161\u018b\250\u0195\252\u018c\253" +
+ "\u0191\255\u019f\001\001\000\002\001\001\000\002\001\001" +
+ "\000\030\003\u01a0\004\u0197\070\u018f\072\u02e2\073\u019b\151" +
+ "\u019d\161\u018b\250\u0195\252\u018c\253\u0191\255\u019f\001\001" +
+ "\000\002\001\001\000\004\234\u02e6\001\001\000\004\236" +
+ "\u02e5\001\001\000\002\001\001\000\002\001\001\000\002" +
+ "\001\001\000\002\001\001\000\004\112\u0120\001\001\000" +
+ "\024\106\u011f\110\144\116\u02eb\117\u011a\120\u0117\121\u011b" +
+ "\132\u0116\226\u0118\233\134\001\001\000\004\246\u02ec\001" +
+ "\001\000\004\247\u02ed\001\001\000\002\001\001\000\024" +
+ "\106\u011f\110\144\116\u02ef\117\u011a\120\u0117\121\u011b\132" +
+ "\u0116\226\u0118\233\134\001\001\000\002\001\001\000\014" +
+ "\106\u011f\110\144\121\u011b\226\u02f1\233\134\001\001\000" +
+ "\002\001\001\000\054\003\u0108\064\153\065\051\105\u0105" +
+ "\106\063\107\377\110\144\121\106\152\044\155\u0100\156" +
+ "\057\160\u0309\161\u0103\201\u0247\226\006\230\021\233\134" +
+ "\243\032\244\040\245\047\256\055\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\174\004" +
+ "\101\062\167\063\124\064\153\065\051\070\131\074\014" +
+ "\100\u02f3\105\204\106\063\107\170\110\144\121\106\122" +
+ "\u02fa\123\u02f4\124\u02f6\125\u02f5\131\075\151\130\152\044" +
+ "\153\022\154\137\155\077\156\057\157\110\161\070\201" +
+ "\025\223\171\225\116\226\006\230\021\233\134\240\111" +
+ "\243\032\244\040\245\047\256\055\001\001\000\002\001" +
"\001\000\002\001\001\000\106\003\174\004\101\062\167" +
- "\063\124\064\153\065\051\070\131\074\014\100\u031c\105" +
+ "\063\124\064\153\065\051\070\131\074\014\100\u02fd\105" +
"\204\106\063\107\170\110\144\121\106\131\075\151\130" +
"\152\044\153\022\154\137\155\077\156\057\157\110\161" +
"\070\201\025\223\171\225\116\226\006\230\021\233\134" +
"\240\111\243\032\244\040\245\047\256\055\001\001\000" +
- "\002\001\001\000\106\003\174\004\101\062\167\063\124" +
- "\064\153\065\051\070\131\074\014\100\u031e\105\204\106" +
- "\063\107\170\110\144\121\106\131\075\151\130\152\044" +
- "\153\022\154\137\155\077\156\057\157\110\161\070\201" +
- "\025\223\171\225\116\226\006\230\021\233\134\240\111" +
- "\243\032\244\040\245\047\256\055\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\067\u0328\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\020" +
- "\003\u0253\041\u032f\044\u0273\045\u0277\162\u0276\220\u0272\221" +
- "\u0279\001\001\000\002\001\001\000\004\042\u0332\001\001" +
- "\000\002\001\001\000\004\222\u0333\001\001\000\002\001" +
- "\001\000\004\015\u0335\001\001\000\136\003\174\004\101" +
- "\014\u0286\016\u0281\017\132\062\167\063\124\064\153\065" +
- "\051\070\131\074\014\100\016\101\100\103\165\104\177" +
- "\105\204\106\063\107\170\110\144\121\106\131\075\133" +
- "\135\151\130\152\044\153\022\154\137\155\077\156\057" +
- "\157\110\161\070\177\u0283\200\u0285\201\025\212\162\213" +
- "\023\214\053\223\171\225\116\226\006\230\021\233\134" +
- "\240\111\243\032\244\040\245\047\256\055\001\001\000" +
- "\002\001\001\000\004\043\u0339\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\003\u0342\001\001\000" +
- "\002\001\001\000\004\055\u0344\001\001\000\002\001\001" +
- "\000\020\003\u0253\041\u0346\044\u0273\045\u0277\162\u0276\220" +
- "\u0272\221\u0279\001\001\000\002\001\001\000\004\042\u0348" +
- "\001\001\000\004\222\u0349\001\001\000\002\001\001\000" +
- "\004\015\u034b\001\001\000\136\003\174\004\101\014\u0286" +
- "\016\u0281\017\132\062\167\063\124\064\153\065\051\070" +
- "\131\074\014\100\016\101\100\103\165\104\177\105\204" +
- "\106\063\107\170\110\144\121\106\131\075\133\135\151" +
- "\130\152\044\153\022\154\137\155\077\156\057\157\110" +
- "\161\070\177\u0283\200\u0285\201\025\212\162\213\023\214" +
- "\053\223\171\225\116\226\006\230\021\233\134\240\111" +
- "\243\032\244\040\245\047\256\055\001\001\000\002\001" +
- "\001\000\002\001\001\000\120\003\174\004\101\014\u0350" +
- "\017\132\062\167\063\124\064\153\065\051\070\131\074" +
- "\014\100\016\101\100\103\165\104\177\105\204\106\063" +
- "\107\170\110\144\121\106\131\075\151\130\152\044\153" +
- "\022\154\137\155\077\156\057\157\110\161\070\201\025" +
- "\223\171\225\116\226\006\230\021\233\134\240\111\243" +
- "\032\244\040\245\047\256\055\001\001\000\004\015\u035a" +
- "\001\001\000\004\035\u0351\001\001\000\004\037\u0352\001" +
- "\001\000\002\001\001\000\120\003\174\004\101\014\u0359" +
- "\017\132\062\167\063\124\064\153\065\051\070\131\074" +
- "\014\100\016\101\100\103\165\104\177\105\204\106\063" +
- "\107\170\110\144\121\106\131\075\151\130\152\044\153" +
- "\022\154\137\155\077\156\057\157\110\161\070\201\025" +
- "\223\171\225\116\226\006\230\021\233\134\240\111\243" +
- "\032\244\040\245\047\256\055\001\001\000\002\001\001" +
- "\000\106\003\174\004\101\062\167\063\124\064\153\065" +
- "\051\070\131\074\014\100\u0356\105\204\106\063\107\170" +
- "\110\144\121\106\131\075\151\130\152\044\153\022\154" +
- "\137\155\077\156\057\157\110\161\070\201\025\223\171" +
- "\225\116\226\006\230\021\233\134\240\111\243\032\244" +
- "\040\245\047\256\055\001\001\000\002\001\001\000\120" +
- "\003\174\004\101\014\u0358\017\132\062\167\063\124\064" +
- "\153\065\051\070\131\074\014\100\016\101\100\103\165" +
- "\104\177\105\204\106\063\107\170\110\144\121\106\131" +
- "\075\151\130\152\044\153\022\154\137\155\077\156\057" +
- "\157\110\161\070\201\025\223\171\225\116\226\006\230" +
- "\021\233\134\240\111\243\032\244\040\245\047\256\055" +
- "\001\001\000\002\001\001\000\002\001\001\000\140\003" +
- "\174\004\101\014\u0286\016\u0281\017\132\036\u035b\062\167" +
- "\063\124\064\153\065\051\070\131\074\014\100\016\101" +
- "\100\103\165\104\177\105\204\106\063\107\170\110\144" +
- "\121\106\131\075\133\135\151\130\152\044\153\022\154" +
- "\137\155\077\156\057\157\110\161\070\177\u0283\200\u0285" +
- "\201\025\212\162\213\023\214\053\223\171\225\116\226" +
- "\006\230\021\233\134\240\111\243\032\244\040\245\047" +
- "\256\055\001\001\000\004\040\u035c\001\001\000\002\001" +
- "\001\000\002\001\001\000\002\001\001\000\106\003\174" +
+ "\002\001\001\000\002\001\001\000\112\003\174\004\101" +
+ "\062\167\063\124\064\153\065\051\070\131\074\014\100" +
+ "\u02f3\105\204\106\063\107\170\110\144\121\106\123\u0300" +
+ "\124\u02f6\131\075\151\130\152\044\153\022\154\137\155" +
+ "\077\156\057\157\110\161\070\201\025\223\171\225\116" +
+ "\226\006\230\021\233\134\240\111\243\032\244\040\245" +
+ "\047\256\055\001\001\000\002\001\001\000\106\003\174" +
"\004\101\062\167\063\124\064\153\065\051\070\131\074" +
- "\014\100\u0360\105\204\106\063\107\170\110\144\121\106" +
+ "\014\100\u0303\105\204\106\063\107\170\110\144\121\106" +
"\131\075\151\130\152\044\153\022\154\137\155\077\156" +
"\057\157\110\161\070\201\025\223\171\225\116\226\006" +
"\230\021\233\134\240\111\243\032\244\040\245\047\256" +
- "\055\001\001\000\002\001\001\000\002\001\001\000\004" +
- "\015\u0363\001\001\000\136\003\174\004\101\014\u0286\016" +
- "\u0281\017\132\062\167\063\124\064\153\065\051\070\131" +
- "\074\014\100\016\101\100\103\165\104\177\105\204\106" +
- "\063\107\170\110\144\121\106\131\075\133\135\151\130" +
- "\152\044\153\022\154\137\155\077\156\057\157\110\161" +
- "\070\177\u0283\200\u0285\201\025\212\162\213\023\214\053" +
- "\223\171\225\116\226\006\230\021\233\134\240\111\243" +
- "\032\244\040\245\047\256\055\001\001\000\004\015\u0365" +
- "\001\001\000\136\003\174\004\101\014\u0286\016\u0281\017" +
- "\132\062\167\063\124\064\153\065\051\070\131\074\014" +
- "\100\016\101\100\103\165\104\177\105\204\106\063\107" +
- "\170\110\144\121\106\131\075\133\135\151\130\152\044" +
- "\153\022\154\137\155\077\156\057\157\110\161\070\177" +
- "\u0283\200\u0285\201\025\212\162\213\023\214\053\223\171" +
+ "\055\001\001\000\054\003\u0108\064\153\065\051\105\u0105" +
+ "\106\063\107\377\110\144\121\106\152\044\155\u0100\156" +
+ "\057\160\u0308\161\u0103\201\u0247\226\006\230\021\233\134" +
+ "\243\032\244\040\245\047\256\055\001\001\000\002\001" +
+ "\001\000\002\001\001\000\116\003\174\004\101\062\167" +
+ "\063\124\064\153\065\051\070\131\074\014\100\u02f3\105" +
+ "\204\106\063\107\170\110\144\121\106\122\u0306\123\u02f4" +
+ "\124\u02f6\125\u02f5\131\075\151\130\152\044\153\022\154" +
+ "\137\155\077\156\057\157\110\161\070\201\025\223\171" +
"\225\116\226\006\230\021\233\134\240\111\243\032\244" +
"\040\245\047\256\055\001\001\000\002\001\001\000\002" +
- "\001\001\000\006\030\u0369\132\u036a\001\001\000\002\001" +
- "\001\000\002\001\001\000\032\003\u01a0\004\u0197\070\u018f" +
- "\071\u036c\072\u01e9\073\u019b\151\u019d\161\u018b\250\u0195\252" +
- "\u018c\253\u0191\255\u019f\001\001\000\002\001\001\000\122" +
- "\003\174\004\101\014\u0374\017\132\027\u0372\062\167\063" +
- "\124\064\153\065\051\070\131\074\014\100\016\101\100" +
- "\103\165\104\177\105\204\106\063\107\170\110\144\121" +
- "\106\131\075\151\130\152\044\153\022\154\137\155\077" +
- "\156\057\157\110\161\070\201\025\223\171\225\116\226" +
- "\006\230\021\233\134\240\111\243\032\244\040\245\047" +
- "\256\055\001\001\000\004\132\u036f\001\001\000\002\001" +
- "\001\000\032\003\u01a0\004\u0197\070\u018f\071\u0371\072\u01e9" +
- "\073\u019b\151\u019d\161\u018b\250\u0195\252\u018c\253\u0191\255" +
- "\u019f\001\001\000\002\001\001\000\002\001\001\000\004" +
- "\015\u0375\001\001\000\002\001\001\000\136\003\174\004" +
+ "\001\001\000\002\001\001\000\002\001\001\000\002\001" +
+ "\001\000\014\106\u011f\110\144\121\u011b\226\u030c\233\134" +
+ "\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\106\003\174\004\101\062" +
+ "\167\063\124\064\153\065\051\070\131\074\014\100\u031b" +
+ "\105\204\106\063\107\170\110\144\121\106\131\075\151" +
+ "\130\152\044\153\022\154\137\155\077\156\057\157\110" +
+ "\161\070\201\025\223\171\225\116\226\006\230\021\233" +
+ "\134\240\111\243\032\244\040\245\047\256\055\001\001" +
+ "\000\002\001\001\000\106\003\174\004\101\062\167\063" +
+ "\124\064\153\065\051\070\131\074\014\100\u031d\105\204" +
+ "\106\063\107\170\110\144\121\106\131\075\151\130\152" +
+ "\044\153\022\154\137\155\077\156\057\157\110\161\070" +
+ "\201\025\223\171\225\116\226\006\230\021\233\134\240" +
+ "\111\243\032\244\040\245\047\256\055\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\067\u0327\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" +
+ "\020\003\u0253\041\u032e\044\u0273\045\u0277\162\u0276\220\u0272" +
+ "\221\u0279\001\001\000\002\001\001\000\004\042\u0331\001" +
+ "\001\000\002\001\001\000\004\222\u0332\001\001\000\002" +
+ "\001\001\000\004\015\u0334\001\001\000\136\003\174\004" +
"\101\014\u0286\016\u0281\017\132\062\167\063\124\064\153" +
"\065\051\070\131\074\014\100\016\101\100\103\165\104" +
"\177\105\204\106\063\107\170\110\144\121\106\131\075" +
@@ -1296,166 +1198,182 @@ public class ASTPHP5Parser extends java_cup.runtime.lr_parser {
"\057\157\110\161\070\177\u0283\200\u0285\201\025\212\162" +
"\213\023\214\053\223\171\225\116\226\006\230\021\233" +
"\134\240\111\243\032\244\040\245\047\256\055\001\001" +
+ "\000\002\001\001\000\004\043\u0338\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\174\004\101\062\167\063\124\064\153" +
- "\065\051\070\131\074\014\100\u02f4\105\204\106\063\107" +
- "\170\110\144\121\106\122\u0381\123\u02f5\124\u02f7\125\u02f6" +
+ "\002\001\001\000\002\001\001\000\004\003\u0341\001\001" +
+ "\000\002\001\001\000\004\055\u0343\001\001\000\002\001" +
+ "\001\000\020\003\u0253\041\u0345\044\u0273\045\u0277\162\u0276" +
+ "\220\u0272\221\u0279\001\001\000\002\001\001\000\004\042" +
+ "\u0347\001\001\000\004\222\u0348\001\001\000\002\001\001" +
+ "\000\004\015\u034a\001\001\000\136\003\174\004\101\014" +
+ "\u0286\016\u0281\017\132\062\167\063\124\064\153\065\051" +
+ "\070\131\074\014\100\016\101\100\103\165\104\177\105" +
+ "\204\106\063\107\170\110\144\121\106\131\075\133\135" +
+ "\151\130\152\044\153\022\154\137\155\077\156\057\157" +
+ "\110\161\070\177\u0283\200\u0285\201\025\212\162\213\023" +
+ "\214\053\223\171\225\116\226\006\230\021\233\134\240" +
+ "\111\243\032\244\040\245\047\256\055\001\001\000\002" +
+ "\001\001\000\002\001\001\000\120\003\174\004\101\014" +
+ "\u034f\017\132\062\167\063\124\064\153\065\051\070\131" +
+ "\074\014\100\016\101\100\103\165\104\177\105\204\106" +
+ "\063\107\170\110\144\121\106\131\075\151\130\152\044" +
+ "\153\022\154\137\155\077\156\057\157\110\161\070\201" +
+ "\025\223\171\225\116\226\006\230\021\233\134\240\111" +
+ "\243\032\244\040\245\047\256\055\001\001\000\004\015" +
+ "\u0359\001\001\000\004\035\u0350\001\001\000\004\037\u0351" +
+ "\001\001\000\002\001\001\000\120\003\174\004\101\014" +
+ "\u0358\017\132\062\167\063\124\064\153\065\051\070\131" +
+ "\074\014\100\016\101\100\103\165\104\177\105\204\106" +
+ "\063\107\170\110\144\121\106\131\075\151\130\152\044" +
+ "\153\022\154\137\155\077\156\057\157\110\161\070\201" +
+ "\025\223\171\225\116\226\006\230\021\233\134\240\111" +
+ "\243\032\244\040\245\047\256\055\001\001\000\002\001" +
+ "\001\000\106\003\174\004\101\062\167\063\124\064\153" +
+ "\065\051\070\131\074\014\100\u0355\105\204\106\063\107" +
+ "\170\110\144\121\106\131\075\151\130\152\044\153\022" +
+ "\154\137\155\077\156\057\157\110\161\070\201\025\223" +
+ "\171\225\116\226\006\230\021\233\134\240\111\243\032" +
+ "\244\040\245\047\256\055\001\001\000\002\001\001\000" +
+ "\120\003\174\004\101\014\u0357\017\132\062\167\063\124" +
+ "\064\153\065\051\070\131\074\014\100\016\101\100\103" +
+ "\165\104\177\105\204\106\063\107\170\110\144\121\106" +
"\131\075\151\130\152\044\153\022\154\137\155\077\156" +
"\057\157\110\161\070\201\025\223\171\225\116\226\006" +
"\230\021\233\134\240\111\243\032\244\040\245\047\256" +
- "\055\001\001\000\002\001\001\000\002\001\001\000\064" +
- "\003\u038d\004\101\064\153\065\051\105\u0105\106\063\107" +
- "\u038b\110\144\121\106\152\044\153\u0386\154\137\155\u0100" +
- "\156\057\161\u0384\201\u038a\226\006\230\021\231\u038c\232" +
- "\u0388\233\134\243\032\244\040\245\047\256\055\001\001" +
- "\000\002\001\001\000\004\003\u03a0\001\001\000\002\001" +
- "\001\000\002\001\001\000\002\001\001\000\004\112\u039d" +
- "\001\001\000\002\001\001\000\002\001\001\000\004\076" +
- "\u038f\001\001\000\002\001\001\000\062\003\u038d\004\101" +
- "\064\153\065\051\105\u0105\106\063\107\u038b\110\144\121" +
- "\106\152\044\153\u0386\154\137\155\u0100\156\057\161\u0384" +
- "\201\u038a\226\006\230\021\232\u0391\233\134\243\032\244" +
- "\040\245\047\256\055\001\001\000\002\001\001\000\002" +
- "\001\001\000\002\001\001\000\032\003\u0398\004\101\106" +
- "\u011f\110\144\121\u011b\154\u0397\164\u017e\165\u0182\166\u0172" +
- "\167\u0233\226\u0231\233\134\001\001\000\004\112\u034d\001" +
- "\001\000\002\001\001\000\004\003\u039c\001\001\000\002" +
- "\001\001\000\004\112\u0399\001\001\000\002\001\001\000" +
- "\002\001\001\000\004\003\u039b\001\001\000\002\001\001" +
- "\000\002\001\001\000\002\001\001\000\004\003\u039f\001" +
- "\001\000\002\001\001\000\002\001\001\000\032\003\u0398" +
- "\004\101\106\u011f\110\144\121\u011b\154\u03a2\164\u017e\165" +
- "\u0182\166\u0172\167\u021f\226\u021d\233\134\001\001\000\004" +
- "\112\u0399\001\001\000\002\001\001\000\106\003\174\004" +
- "\101\062\167\063\124\064\153\065\051\070\131\074\014" +
- "\100\u03a6\105\204\106\063\107\170\110\144\121\106\131" +
- "\075\151\130\152\044\153\022\154\137\155\077\156\057" +
- "\157\110\161\070\201\025\223\171\225\116\226\006\230" +
- "\021\233\134\240\111\243\032\244\040\245\047\256\055" +
- "\001\001\000\002\001\001\000\002\001\001\000\002\001" +
- "\001\000\002\001\001\000\026\106\u011f\110\144\121\u011b" +
- "\164\u017e\165\u0182\166\u0172\167\u03ab\226\u0231\233\134\241" +
- "\u03aa\001\001\000\004\112\u03ac\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\112\003\174\004\101" +
- "\062\167\063\226\064\153\065\051\070\131\074\014\100" +
- "\220\102\222\104\u037d\105\204\106\063\107\170\110\144" +
- "\121\106\131\075\151\130\152\044\153\022\154\137\155" +
- "\077\156\057\157\223\161\070\201\221\223\227\225\116" +
- "\226\006\230\021\233\134\240\111\243\032\244\040\245" +
- "\047\256\055\001\001\000\002\001\001\000\002\001\001" +
- "\000\002\001\001\000\002\001\001\000\030\003\u01a0\004" +
- "\u0197\070\u018f\072\u03b7\073\u019b\151\u019d\161\u018b\250\u0195" +
- "\252\u018c\253\u0191\255\u019f\001\001\000\002\001\001\000" +
- "\002\001\001\000\002\001\001\000\002\001\001\000\106" +
- "\003\174\004\101\062\167\063\124\064\153\065\051\070" +
- "\131\074\014\100\u03bc\105\204\106\063\107\170\110\144" +
- "\121\106\131\075\151\130\152\044\153\022\154\137\155" +
- "\077\156\057\157\110\161\070\201\025\223\171\225\116" +
+ "\055\001\001\000\002\001\001\000\002\001\001\000\140" +
+ "\003\174\004\101\014\u0286\016\u0281\017\132\036\u035a\062" +
+ "\167\063\124\064\153\065\051\070\131\074\014\100\016" +
+ "\101\100\103\165\104\177\105\204\106\063\107\170\110" +
+ "\144\121\106\131\075\133\135\151\130\152\044\153\022" +
+ "\154\137\155\077\156\057\157\110\161\070\177\u0283\200" +
+ "\u0285\201\025\212\162\213\023\214\053\223\171\225\116" +
"\226\006\230\021\233\134\240\111\243\032\244\040\245" +
- "\047\256\055\001\001\000\002\001\001\000\004\031\u03be" +
- "\001\001\000\002\001\001\000\004\032\u03d1\001\001\000" +
- "\004\032\u03c1\001\001\000\002\001\001\000\004\032\u03c3" +
+ "\047\256\055\001\001\000\004\040\u035b\001\001\000\002" +
"\001\001\000\002\001\001\000\002\001\001\000\106\003" +
"\174\004\101\062\167\063\124\064\153\065\051\070\131" +
- "\074\014\100\u03cb\105\204\106\063\107\170\110\144\121" +
- "\106\131\075\151\130\152\044\153\022\154\137\155\077" +
- "\156\057\157\110\161\070\201\025\223\171\225\116\226" +
- "\006\230\021\233\134\240\111\243\032\244\040\245\047" +
- "\256\055\001\001\000\004\033\u03c7\001\001\000\004\015" +
- "\u03ca\001\001\000\002\001\001\000\002\001\001\000\136" +
- "\003\174\004\101\014\u0286\016\u0281\017\132\062\167\063" +
- "\124\064\153\065\051\070\131\074\014\100\016\101\100" +
- "\103\165\104\177\105\204\106\063\107\170\110\144\121" +
- "\106\131\075\133\135\151\130\152\044\153\022\154\137" +
- "\155\077\156\057\157\110\161\070\177\u0283\200\u0285\201" +
- "\025\212\162\213\023\214\053\223\171\225\116\226\006" +
- "\230\021\233\134\240\111\243\032\244\040\245\047\256" +
- "\055\001\001\000\004\033\u03cc\001\001\000\004\015\u03cd" +
- "\001\001\000\136\003\174\004\101\014\u0286\016\u0281\017" +
- "\132\062\167\063\124\064\153\065\051\070\131\074\014" +
- "\100\016\101\100\103\165\104\177\105\204\106\063\107" +
- "\170\110\144\121\106\131\075\133\135\151\130\152\044" +
- "\153\022\154\137\155\077\156\057\157\110\161\070\177" +
- "\u0283\200\u0285\201\025\212\162\213\023\214\053\223\171" +
- "\225\116\226\006\230\021\233\134\240\111\243\032\244" +
- "\040\245\047\256\055\001\001\000\002\001\001\000\002" +
- "\001\001\000\002\001\001\000\002\001\001\000\004\032" +
- "\u03d3\001\001\000\002\001\001\000\002\001\001\000\002" +
- "\001\001\000\010\046\u03d7\047\335\056\336\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\106\003" +
- "\174\004\101\062\167\063\124\064\153\065\051\070\131" +
- "\074\014\100\u03df\105\204\106\063\107\170\110\144\121" +
+ "\074\014\100\u035f\105\204\106\063\107\170\110\144\121" +
"\106\131\075\151\130\152\044\153\022\154\137\155\077" +
"\156\057\157\110\161\070\201\025\223\171\225\116\226" +
"\006\230\021\233\134\240\111\243\032\244\040\245\047" +
"\256\055\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\144\u03e5\001\001\000\016\145\u03e9\173" +
- "\u03eb\224\u03ea\234\u0268\235\u03e6\236\u0267\001\001\000\006" +
- "\234\u02e5\236\u02e4\001\001\000\010\003\u02b2\135\u03f8\150" +
- "\u02b1\001\001\000\002\001\001\000\002\001\001\000\012" +
- "\003\u0253\162\u0276\220\u03f5\221\u0279\001\001\000\002\001" +
- "\001\000\002\001\001\000\004\055\u03ee\001\001\000\012" +
- "\164\u017e\165\u0182\166\u0172\167\u03ef\001\001\000\002\001" +
- "\001\000\020\003\u0253\041\u03f1\044\u0273\045\u0277\162\u0276" +
- "\220\u0272\221\u0279\001\001\000\002\001\001\000\004\222" +
- "\u03f3\001\001\000\004\174\u03f4\001\001\000\002\001\001" +
- "\000\004\163\u03f6\001\001\000\002\001\001\000\002\001" +
- "\001\000\004\136\u03f9\001\001\000\002\001\001\000\002" +
- "\001\001\000\002\001\001\000\106\003\174\004\101\062" +
- "\167\063\124\064\153\065\051\070\131\074\014\100\u03fd" +
- "\105\204\106\063\107\170\110\144\121\106\131\075\151" +
+ "\004\015\u0362\001\001\000\136\003\174\004\101\014\u0286" +
+ "\016\u0281\017\132\062\167\063\124\064\153\065\051\070" +
+ "\131\074\014\100\016\101\100\103\165\104\177\105\204" +
+ "\106\063\107\170\110\144\121\106\131\075\133\135\151" +
"\130\152\044\153\022\154\137\155\077\156\057\157\110" +
- "\161\070\201\025\223\171\225\116\226\006\230\021\233" +
- "\134\240\111\243\032\244\040\245\047\256\055\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" +
- "\132\u0405\001\001\000\002\001\001\000\002\001\001\000" +
- "\030\003\u01a0\004\u0197\070\u018f\072\u0407\073\u019b\151\u019d" +
- "\161\u018b\250\u0195\252\u018c\253\u0191\255\u019f\001\001\000" +
- "\002\001\001\000\004\134\u0409\001\001\000\002\001\001" +
- "\000\010\003\u0253\162\u0251\217\u040b\001\001\000\002\001" +
- "\001\000\004\146\u040d\001\001\000\016\147\u0410\172\u040f" +
- "\173\u0414\234\u0412\235\u040e\236\u0267\001\001\000\006\234" +
- "\u0420\236\u02e4\001\001\000\004\170\u041e\001\001\000\002" +
- "\001\001\000\002\001\001\000\006\235\u041d\236\u029d\001" +
- "\001\000\002\001\001\000\002\001\001\000\004\055\u0416" +
- "\001\001\000\012\164\u017e\165\u0182\166\u0172\167\u0417\001" +
- "\001\000\002\001\001\000\020\003\u0253\041\u0419\044\u0273" +
- "\045\u0277\162\u0276\220\u0272\221\u0279\001\001\000\002\001" +
- "\001\000\004\222\u041b\001\001\000\002\001\001\000\002" +
- "\001\001\000\004\236\u029f\001\001\000\002\001\001\000" +
- "\002\001\001\000\004\236\u02e6\001\001\000\006\127\u0423" +
- "\233\u0422\001\001\000\002\001\001\000\002\001\001\000" +
- "\002\001\001\000\052\003\u0108\064\153\065\051\105\u0105" +
- "\106\063\107\377\110\144\121\106\152\044\155\u0100\156" +
- "\057\161\u0103\201\u042f\226\006\230\021\233\134\243\032" +
- "\244\040\245\047\256\055\001\001\000\106\003\174\004" +
- "\101\062\167\063\124\064\153\065\051\070\131\074\014" +
- "\100\u0428\105\204\106\063\107\170\110\144\121\106\131" +
- "\075\151\130\152\044\153\022\154\137\155\077\156\057" +
- "\157\110\161\070\201\025\223\171\225\116\226\006\230" +
- "\021\233\134\240\111\243\032\244\040\245\047\256\055" +
- "\001\001\000\002\001\001\000\002\001\001\000\002\001" +
- "\001\000\106\003\174\004\101\062\167\063\124\064\153" +
- "\065\051\070\131\074\014\100\u042b\105\204\106\063\107" +
- "\170\110\144\121\106\131\075\151\130\152\044\153\022" +
- "\154\137\155\077\156\057\157\110\161\070\201\025\223" +
+ "\161\070\177\u0283\200\u0285\201\025\212\162\213\023\214" +
+ "\053\223\171\225\116\226\006\230\021\233\134\240\111" +
+ "\243\032\244\040\245\047\256\055\001\001\000\004\015" +
+ "\u0364\001\001\000\136\003\174\004\101\014\u0286\016\u0281" +
+ "\017\132\062\167\063\124\064\153\065\051\070\131\074" +
+ "\014\100\016\101\100\103\165\104\177\105\204\106\063" +
+ "\107\170\110\144\121\106\131\075\133\135\151\130\152" +
+ "\044\153\022\154\137\155\077\156\057\157\110\161\070" +
+ "\177\u0283\200\u0285\201\025\212\162\213\023\214\053\223" +
"\171\225\116\226\006\230\021\233\134\240\111\243\032" +
"\244\040\245\047\256\055\001\001\000\002\001\001\000" +
+ "\002\001\001\000\006\030\u0368\132\u0369\001\001\000\002" +
+ "\001\001\000\002\001\001\000\032\003\u01a0\004\u0197\070" +
+ "\u018f\071\u036b\072\u01e9\073\u019b\151\u019d\161\u018b\250\u0195" +
+ "\252\u018c\253\u0191\255\u019f\001\001\000\002\001\001\000" +
+ "\122\003\174\004\101\014\u0373\017\132\027\u0371\062\167" +
+ "\063\124\064\153\065\051\070\131\074\014\100\016\101" +
+ "\100\103\165\104\177\105\204\106\063\107\170\110\144" +
+ "\121\106\131\075\151\130\152\044\153\022\154\137\155" +
+ "\077\156\057\157\110\161\070\201\025\223\171\225\116" +
+ "\226\006\230\021\233\134\240\111\243\032\244\040\245" +
+ "\047\256\055\001\001\000\004\132\u036e\001\001\000\002" +
+ "\001\001\000\032\003\u01a0\004\u0197\070\u018f\071\u0370\072" +
+ "\u01e9\073\u019b\151\u019d\161\u018b\250\u0195\252\u018c\253\u0191" +
+ "\255\u019f\001\001\000\002\001\001\000\002\001\001\000" +
+ "\004\015\u0374\001\001\000\002\001\001\000\136\003\174" +
+ "\004\101\014\u0286\016\u0281\017\132\062\167\063\124\064" +
+ "\153\065\051\070\131\074\014\100\016\101\100\103\165" +
+ "\104\177\105\204\106\063\107\170\110\144\121\106\131" +
+ "\075\133\135\151\130\152\044\153\022\154\137\155\077" +
+ "\156\057\157\110\161\070\177\u0283\200\u0285\201\025\212" +
+ "\162\213\023\214\053\223\171\225\116\226\006\230\021" +
+ "\233\134\240\111\243\032\244\040\245\047\256\055\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\010\130\u0435\132\u0436\233" +
- "\u0434\001\001\000\004\132\u0433\001\001\000\002\001\001" +
+ "\001\001\000\116\003\174\004\101\062\167\063\124\064" +
+ "\153\065\051\070\131\074\014\100\u02f3\105\204\106\063" +
+ "\107\170\110\144\121\106\122\u0380\123\u02f4\124\u02f6\125" +
+ "\u02f5\131\075\151\130\152\044\153\022\154\137\155\077" +
+ "\156\057\157\110\161\070\201\025\223\171\225\116\226" +
+ "\006\230\021\233\134\240\111\243\032\244\040\245\047" +
+ "\256\055\001\001\000\002\001\001\000\002\001\001\000" +
+ "\064\003\u038c\004\101\064\153\065\051\105\u0105\106\063" +
+ "\107\u038a\110\144\121\106\152\044\153\u0385\154\137\155" +
+ "\u0100\156\057\161\u0383\201\u0389\226\006\230\021\231\u038b" +
+ "\232\u0387\233\134\243\032\244\040\245\047\256\055\001" +
+ "\001\000\002\001\001\000\004\003\u039f\001\001\000\002" +
+ "\001\001\000\002\001\001\000\002\001\001\000\004\112" +
+ "\u039c\001\001\000\002\001\001\000\002\001\001\000\004" +
+ "\076\u038e\001\001\000\002\001\001\000\062\003\u038c\004" +
+ "\101\064\153\065\051\105\u0105\106\063\107\u038a\110\144" +
+ "\121\106\152\044\153\u0385\154\137\155\u0100\156\057\161" +
+ "\u0383\201\u0389\226\006\230\021\232\u0390\233\134\243\032" +
+ "\244\040\245\047\256\055\001\001\000\002\001\001\000" +
+ "\002\001\001\000\002\001\001\000\032\003\u0397\004\101" +
+ "\106\u011f\110\144\121\u011b\154\u0396\164\u017e\165\u0182\166" +
+ "\u0172\167\u0233\226\u0231\233\134\001\001\000\004\112\u034c" +
+ "\001\001\000\002\001\001\000\004\003\u039b\001\001\000" +
+ "\002\001\001\000\004\112\u0398\001\001\000\002\001\001" +
+ "\000\002\001\001\000\004\003\u039a\001\001\000\002\001" +
+ "\001\000\002\001\001\000\002\001\001\000\004\003\u039e" +
+ "\001\001\000\002\001\001\000\002\001\001\000\032\003" +
+ "\u0397\004\101\106\u011f\110\144\121\u011b\154\u03a1\164\u017e" +
+ "\165\u0182\166\u0172\167\u021f\226\u021d\233\134\001\001\000" +
+ "\004\112\u0398\001\001\000\002\001\001\000\106\003\174" +
+ "\004\101\062\167\063\124\064\153\065\051\070\131\074" +
+ "\014\100\u03a5\105\204\106\063\107\170\110\144\121\106" +
+ "\131\075\151\130\152\044\153\022\154\137\155\077\156" +
+ "\057\157\110\161\070\201\025\223\171\225\116\226\006" +
+ "\230\021\233\134\240\111\243\032\244\040\245\047\256" +
+ "\055\001\001\000\002\001\001\000\002\001\001\000\002" +
+ "\001\001\000\002\001\001\000\026\106\u011f\110\144\121" +
+ "\u011b\164\u017e\165\u0182\166\u0172\167\u03aa\226\u0231\233\134" +
+ "\241\u03a9\001\001\000\004\112\u03ab\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\112\003\174\004" +
+ "\101\062\167\063\226\064\153\065\051\070\131\074\014" +
+ "\100\220\102\222\104\u037c\105\204\106\063\107\170\110" +
+ "\144\121\106\131\075\151\130\152\044\153\022\154\137" +
+ "\155\077\156\057\157\223\161\070\201\221\223\227\225" +
+ "\116\226\006\230\021\233\134\240\111\243\032\244\040" +
+ "\245\047\256\055\001\001\000\002\001\001\000\002\001" +
+ "\001\000\002\001\001\000\002\001\001\000\030\003\u01a0" +
+ "\004\u0197\070\u018f\072\u03b6\073\u019b\151\u019d\161\u018b\250" +
+ "\u0195\252\u018c\253\u0191\255\u019f\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\132\u043a\001\001" +
- "\000\002\001\001\000\020\003\u0253\041\u043c\044\u0273\045" +
- "\u0277\162\u0276\220\u0272\221\u0279\001\001\000\002\001\001" +
- "\000\004\222\u043e\001\001\000\002\001\001\000\004\015" +
- "\u0440\001\001\000\136\003\174\004\101\014\u0286\016\u0281" +
+ "\106\003\174\004\101\062\167\063\124\064\153\065\051" +
+ "\070\131\074\014\100\u03bb\105\204\106\063\107\170\110" +
+ "\144\121\106\131\075\151\130\152\044\153\022\154\137" +
+ "\155\077\156\057\157\110\161\070\201\025\223\171\225" +
+ "\116\226\006\230\021\233\134\240\111\243\032\244\040" +
+ "\245\047\256\055\001\001\000\002\001\001\000\004\031" +
+ "\u03bd\001\001\000\002\001\001\000\004\032\u03d0\001\001" +
+ "\000\004\032\u03c0\001\001\000\002\001\001\000\004\032" +
+ "\u03c2\001\001\000\002\001\001\000\002\001\001\000\106" +
+ "\003\174\004\101\062\167\063\124\064\153\065\051\070" +
+ "\131\074\014\100\u03ca\105\204\106\063\107\170\110\144" +
+ "\121\106\131\075\151\130\152\044\153\022\154\137\155" +
+ "\077\156\057\157\110\161\070\201\025\223\171\225\116" +
+ "\226\006\230\021\233\134\240\111\243\032\244\040\245" +
+ "\047\256\055\001\001\000\004\033\u03c6\001\001\000\004" +
+ "\015\u03c9\001\001\000\002\001\001\000\002\001\001\000" +
+ "\136\003\174\004\101\014\u0286\016\u0281\017\132\062\167" +
+ "\063\124\064\153\065\051\070\131\074\014\100\016\101" +
+ "\100\103\165\104\177\105\204\106\063\107\170\110\144" +
+ "\121\106\131\075\133\135\151\130\152\044\153\022\154" +
+ "\137\155\077\156\057\157\110\161\070\177\u0283\200\u0285" +
+ "\201\025\212\162\213\023\214\053\223\171\225\116\226" +
+ "\006\230\021\233\134\240\111\243\032\244\040\245\047" +
+ "\256\055\001\001\000\004\033\u03cb\001\001\000\004\015" +
+ "\u03cc\001\001\000\136\003\174\004\101\014\u0286\016\u0281" +
"\017\132\062\167\063\124\064\153\065\051\070\131\074" +
"\014\100\016\101\100\103\165\104\177\105\204\106\063" +
"\107\170\110\144\121\106\131\075\133\135\151\130\152" +
@@ -1463,68 +1381,156 @@ public class ASTPHP5Parser extends java_cup.runtime.lr_parser {
"\177\u0283\200\u0285\201\025\212\162\213\023\214\053\223" +
"\171\225\116\226\006\230\021\233\134\240\111\243\032" +
"\244\040\245\047\256\055\001\001\000\002\001\001\000" +
+ "\002\001\001\000\002\001\001\000\002\001\001\000\004" +
+ "\032\u03d2\001\001\000\002\001\001\000\002\001\001\000" +
+ "\002\001\001\000\010\046\u03d6\047\335\056\336\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\106" +
- "\003\174\004\101\062\u0447\063\124\064\153\065\051\070" +
- "\131\074\014\100\220\105\204\106\063\107\170\110\144" +
+ "\003\174\004\101\062\167\063\124\064\153\065\051\070" +
+ "\131\074\014\100\u03de\105\204\106\063\107\170\110\144" +
"\121\106\131\075\151\130\152\044\153\022\154\137\155" +
- "\077\156\057\157\110\161\070\201\u0446\223\171\225\116" +
+ "\077\156\057\157\110\161\070\201\025\223\171\225\116" +
"\226\006\230\021\233\134\240\111\243\032\244\040\245" +
"\047\256\055\001\001\000\002\001\001\000\002\001\001" +
- "\000\054\003\u0108\024\u0449\064\153\065\051\105\u0105\106" +
- "\063\107\377\110\144\121\106\152\044\155\u0100\156\057" +
- "\161\u0103\201\u044b\226\006\230\021\233\134\243\032\244" +
- "\040\245\047\256\055\001\001\000\004\023\u0454\001\001" +
- "\000\116\003\174\004\101\062\167\063\124\064\153\065" +
- "\051\070\131\074\014\100\u02f4\105\204\106\063\107\170" +
- "\110\144\121\106\122\u0452\123\u02f5\124\u02f7\125\u02f6\131" +
+ "\000\002\001\001\000\002\001\001\000\002\001\001\000" +
+ "\002\001\001\000\004\144\u03e4\001\001\000\016\145\u03e8" +
+ "\173\u03ea\224\u03e9\234\u0268\235\u03e5\236\u0267\001\001\000" +
+ "\006\234\u02e4\236\u02e3\001\001\000\010\003\u02b1\135\u03f6" +
+ "\150\u02b0\001\001\000\002\001\001\000\002\001\001\000" +
+ "\004\163\u03f4\001\001\000\002\001\001\000\002\001\001" +
+ "\000\004\055\u03ed\001\001\000\012\164\u017e\165\u0182\166" +
+ "\u0172\167\u03ee\001\001\000\002\001\001\000\020\003\u0253" +
+ "\041\u03f0\044\u0273\045\u0277\162\u0276\220\u0272\221\u0279\001" +
+ "\001\000\002\001\001\000\004\222\u03f2\001\001\000\004" +
+ "\174\u03f3\001\001\000\002\001\001\000\002\001\001\000" +
+ "\002\001\001\000\004\136\u03f7\001\001\000\002\001\001" +
+ "\000\002\001\001\000\002\001\001\000\106\003\174\004" +
+ "\101\062\167\063\124\064\153\065\051\070\131\074\014" +
+ "\100\u03fb\105\204\106\063\107\170\110\144\121\106\131" +
"\075\151\130\152\044\153\022\154\137\155\077\156\057" +
"\157\110\161\070\201\025\223\171\225\116\226\006\230" +
"\021\233\134\240\111\243\032\244\040\245\047\256\055" +
- "\001\001\000\002\001\001\000\052\003\u0108\064\153\065" +
- "\051\105\u0105\106\063\107\377\110\144\121\106\152\044" +
- "\155\u0100\156\057\161\u0103\201\u0451\226\006\230\021\233" +
- "\134\243\032\244\040\245\047\256\055\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\132\u0403\001\001\000\002\001\001\000\002\001" +
+ "\001\000\030\003\u01a0\004\u0197\070\u018f\072\u0405\073\u019b" +
+ "\151\u019d\161\u018b\250\u0195\252\u018c\253\u0191\255\u019f\001" +
+ "\001\000\002\001\001\000\004\134\u0407\001\001\000\002" +
+ "\001\001\000\010\003\u0253\162\u0251\217\u0409\001\001\000" +
+ "\002\001\001\000\004\146\u040b\001\001\000\016\147\u040e" +
+ "\172\u040d\173\u0412\234\u0410\235\u040c\236\u0267\001\001\000" +
+ "\006\234\u041e\236\u02e3\001\001\000\004\170\u041c\001\001" +
+ "\000\002\001\001\000\002\001\001\000\006\235\u041b\236" +
+ "\u029d\001\001\000\002\001\001\000\002\001\001\000\004" +
+ "\055\u0414\001\001\000\012\164\u017e\165\u0182\166\u0172\167" +
+ "\u0415\001\001\000\002\001\001\000\020\003\u0253\041\u0417" +
+ "\044\u0273\045\u0277\162\u0276\220\u0272\221\u0279\001\001\000" +
+ "\002\001\001\000\004\222\u0419\001\001\000\002\001\001" +
+ "\000\002\001\001\000\004\236\u029f\001\001\000\002\001" +
+ "\001\000\002\001\001\000\004\236\u02e5\001\001\000\006" +
+ "\127\u0421\233\u0420\001\001\000\002\001\001\000\002\001" +
+ "\001\000\002\001\001\000\052\003\u0108\064\153\065\051" +
+ "\105\u0105\106\063\107\377\110\144\121\106\152\044\155" +
+ "\u0100\156\057\161\u0103\201\u042d\226\006\230\021\233\134" +
+ "\243\032\244\040\245\047\256\055\001\001\000\106\003" +
+ "\174\004\101\062\167\063\124\064\153\065\051\070\131" +
+ "\074\014\100\u0426\105\204\106\063\107\170\110\144\121" +
+ "\106\131\075\151\130\152\044\153\022\154\137\155\077" +
+ "\156\057\157\110\161\070\201\025\223\171\225\116\226" +
+ "\006\230\021\233\134\240\111\243\032\244\040\245\047" +
+ "\256\055\001\001\000\002\001\001\000\002\001\001\000" +
+ "\002\001\001\000\106\003\174\004\101\062\167\063\124" +
+ "\064\153\065\051\070\131\074\014\100\u0429\105\204\106" +
+ "\063\107\170\110\144\121\106\131\075\151\130\152\044" +
+ "\153\022\154\137\155\077\156\057\157\110\161\070\201" +
+ "\025\223\171\225\116\226\006\230\021\233\134\240\111" +
+ "\243\032\244\040\245\047\256\055\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\130\u0433\132" +
+ "\u0434\233\u0432\001\001\000\004\132\u0431\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\132\u0438" +
+ "\001\001\000\002\001\001\000\020\003\u0253\041\u043a\044" +
+ "\u0273\045\u0277\162\u0276\220\u0272\221\u0279\001\001\000\002" +
+ "\001\001\000\004\222\u043c\001\001\000\002\001\001\000" +
+ "\004\015\u043e\001\001\000\136\003\174\004\101\014\u0286" +
+ "\016\u0281\017\132\062\167\063\124\064\153\065\051\070" +
+ "\131\074\014\100\016\101\100\103\165\104\177\105\204" +
+ "\106\063\107\170\110\144\121\106\131\075\133\135\151" +
+ "\130\152\044\153\022\154\137\155\077\156\057\157\110" +
+ "\161\070\177\u0283\200\u0285\201\025\212\162\213\023\214" +
+ "\053\223\171\225\116\226\006\230\021\233\134\240\111" +
+ "\243\032\244\040\245\047\256\055\001\001\000\002\001" +
+ "\001\000\002\001\001\000\002\001\001\000\002\001\001" +
+ "\000\106\003\174\004\101\062\u0445\063\124\064\153\065" +
+ "\051\070\131\074\014\100\220\105\204\106\063\107\170" +
+ "\110\144\121\106\131\075\151\130\152\044\153\022\154" +
+ "\137\155\077\156\057\157\110\161\070\201\u0444\223\171" +
+ "\225\116\226\006\230\021\233\134\240\111\243\032\244" +
+ "\040\245\047\256\055\001\001\000\002\001\001\000\002" +
+ "\001\001\000\054\003\u0108\024\u0447\064\153\065\051\105" +
+ "\u0105\106\063\107\377\110\144\121\106\152\044\155\u0100" +
+ "\156\057\161\u0103\201\u0449\226\006\230\021\233\134\243" +
+ "\032\244\040\245\047\256\055\001\001\000\004\023\u0452" +
"\001\001\000\116\003\174\004\101\062\167\063\124\064" +
- "\153\065\051\070\131\074\014\100\u02f4\105\204\106\063" +
- "\107\170\110\144\121\106\122\u044f\123\u02f5\124\u02f7\125" +
- "\u02f6\131\075\151\130\152\044\153\022\154\137\155\077" +
+ "\153\065\051\070\131\074\014\100\u02f3\105\204\106\063" +
+ "\107\170\110\144\121\106\122\u0450\123\u02f4\124\u02f6\125" +
+ "\u02f5\131\075\151\130\152\044\153\022\154\137\155\077" +
"\156\057\157\110\161\070\201\025\223\171\225\116\226" +
"\006\230\021\233\134\240\111\243\032\244\040\245\047" +
- "\256\055\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\u0108\024\u0456\064\153\065\051\105" +
- "\u0105\106\063\107\377\110\144\121\106\152\044\155\u0100" +
- "\156\057\161\u0103\201\u044b\226\006\230\021\233\134\243" +
- "\032\244\040\245\047\256\055\001\001\000\002\001\001" +
- "\000\122\003\174\004\101\014\u0459\017\132\026\u045a\062" +
+ "\256\055\001\001\000\002\001\001\000\052\003\u0108\064" +
+ "\153\065\051\105\u0105\106\063\107\377\110\144\121\106" +
+ "\152\044\155\u0100\156\057\161\u0103\201\u044f\226\006\230" +
+ "\021\233\134\243\032\244\040\245\047\256\055\001\001" +
+ "\000\002\001\001\000\116\003\174\004\101\062\167\063" +
+ "\124\064\153\065\051\070\131\074\014\100\u02f3\105\204" +
+ "\106\063\107\170\110\144\121\106\122\u044d\123\u02f4\124" +
+ "\u02f6\125\u02f5\131\075\151\130\152\044\153\022\154\137" +
+ "\155\077\156\057\157\110\161\070\201\025\223\171\225" +
+ "\116\226\006\230\021\233\134\240\111\243\032\244\040" +
+ "\245\047\256\055\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\u0108\024\u0454\064\153\065" +
+ "\051\105\u0105\106\063\107\377\110\144\121\106\152\044" +
+ "\155\u0100\156\057\161\u0103\201\u0449\226\006\230\021\233" +
+ "\134\243\032\244\040\245\047\256\055\001\001\000\002" +
+ "\001\001\000\122\003\174\004\101\014\u0457\017\132\026" +
+ "\u0458\062\167\063\124\064\153\065\051\070\131\074\014" +
+ "\100\016\101\100\103\165\104\177\105\204\106\063\107" +
+ "\170\110\144\121\106\131\075\151\130\152\044\153\022" +
+ "\154\137\155\077\156\057\157\110\161\070\201\025\223" +
+ "\171\225\116\226\006\230\021\233\134\240\111\243\032" +
+ "\244\040\245\047\256\055\001\001\000\004\015\u0459\001" +
+ "\001\000\002\001\001\000\002\001\001\000\136\003\174" +
+ "\004\101\014\u0286\016\u0281\017\132\062\167\063\124\064" +
+ "\153\065\051\070\131\074\014\100\016\101\100\103\165" +
+ "\104\177\105\204\106\063\107\170\110\144\121\106\131" +
+ "\075\133\135\151\130\152\044\153\022\154\137\155\077" +
+ "\156\057\157\110\161\070\177\u0283\200\u0285\201\025\212" +
+ "\162\213\023\214\053\223\171\225\116\226\006\230\021" +
+ "\233\134\240\111\243\032\244\040\245\047\256\055\001" +
+ "\001\000\002\001\001\000\002\001\001\000\054\003\u0108" +
+ "\024\u045d\064\153\065\051\105\u0105\106\063\107\377\110" +
+ "\144\121\106\152\044\155\u0100\156\057\161\u0103\201\u0449" +
+ "\226\006\230\021\233\134\243\032\244\040\245\047\256" +
+ "\055\001\001\000\004\023\u045e\001\001\000\002\001\001" +
+ "\000\122\003\174\004\101\014\u0457\017\132\026\u0460\062" +
"\167\063\124\064\153\065\051\070\131\074\014\100\016" +
"\101\100\103\165\104\177\105\204\106\063\107\170\110" +
"\144\121\106\131\075\151\130\152\044\153\022\154\137" +
"\155\077\156\057\157\110\161\070\201\025\223\171\225" +
"\116\226\006\230\021\233\134\240\111\243\032\244\040" +
- "\245\047\256\055\001\001\000\004\015\u045b\001\001\000" +
- "\002\001\001\000\002\001\001\000\136\003\174\004\101" +
- "\014\u0286\016\u0281\017\132\062\167\063\124\064\153\065" +
- "\051\070\131\074\014\100\016\101\100\103\165\104\177" +
- "\105\204\106\063\107\170\110\144\121\106\131\075\133" +
- "\135\151\130\152\044\153\022\154\137\155\077\156\057" +
- "\157\110\161\070\177\u0283\200\u0285\201\025\212\162\213" +
- "\023\214\053\223\171\225\116\226\006\230\021\233\134" +
- "\240\111\243\032\244\040\245\047\256\055\001\001\000" +
- "\002\001\001\000\002\001\001\000\054\003\u0108\024\u045f" +
- "\064\153\065\051\105\u0105\106\063\107\377\110\144\121" +
- "\106\152\044\155\u0100\156\057\161\u0103\201\u044b\226\006" +
- "\230\021\233\134\243\032\244\040\245\047\256\055\001" +
- "\001\000\004\023\u0460\001\001\000\002\001\001\000\122" +
- "\003\174\004\101\014\u0459\017\132\026\u0462\062\167\063" +
- "\124\064\153\065\051\070\131\074\014\100\016\101\100" +
- "\103\165\104\177\105\204\106\063\107\170\110\144\121" +
- "\106\131\075\151\130\152\044\153\022\154\137\155\077" +
- "\156\057\157\110\161\070\201\025\223\171\225\116\226" +
- "\006\230\021\233\134\240\111\243\032\244\040\245\047" +
- "\256\055\001\001\000\002\001\001\000\002\001\001\000" +
- "\002\001\001\000\004\012\u046b\001\001\000\002\001\001" +
- "\000\004\012\u0469\001\001\000\002\001\001\000\140\003" +
+ "\245\047\256\055\001\001\000\002\001\001\000\002\001" +
+ "\001\000\002\001\001\000\004\012\u0469\001\001\000\002" +
+ "\001\001\000\004\012\u0467\001\001\000\002\001\001\000" +
+ "\140\003\174\004\101\013\206\014\200\017\132\062\167" +
+ "\063\124\064\153\065\051\070\131\074\014\100\016\101" +
+ "\100\103\165\104\177\105\204\106\063\107\170\110\144" +
+ "\121\106\131\075\133\135\151\130\152\044\153\022\154" +
+ "\137\155\077\156\057\157\110\161\070\171\136\177\121" +
+ "\200\150\201\025\212\162\213\023\214\053\223\171\225" +
+ "\116\226\006\230\021\233\134\240\111\243\032\244\040" +
+ "\245\047\256\055\001\001\000\002\001\001\000\140\003" +
"\174\004\101\013\206\014\200\017\132\062\167\063\124" +
"\064\153\065\051\070\131\074\014\100\016\101\100\103" +
"\165\104\177\105\204\106\063\107\170\110\144\121\106" +
@@ -1532,100 +1538,114 @@ public class ASTPHP5Parser extends java_cup.runtime.lr_parser {
"\077\156\057\157\110\161\070\171\136\177\121\200\150" +
"\201\025\212\162\213\023\214\053\223\171\225\116\226" +
"\006\230\021\233\134\240\111\243\032\244\040\245\047" +
- "\256\055\001\001\000\002\001\001\000\140\003\174\004" +
- "\101\013\206\014\200\017\132\062\167\063\124\064\153" +
- "\065\051\070\131\074\014\100\016\101\100\103\165\104" +
- "\177\105\204\106\063\107\170\110\144\121\106\131\075" +
- "\133\135\151\130\152\044\153\022\154\137\155\077\156" +
- "\057\157\110\161\070\171\136\177\121\200\150\201\025" +
- "\212\162\213\023\214\053\223\171\225\116\226\006\230" +
- "\021\233\134\240\111\243\032\244\040\245\047\256\055" +
- "\001\001\000\002\001\001\000\056\003\u0108\020\u0470\021" +
- "\u046e\064\153\065\051\105\u0105\106\063\107\377\110\144" +
- "\121\106\152\044\155\u0100\156\057\161\u0103\201\u046f\226" +
- "\006\230\021\233\134\243\032\244\040\245\047\256\055" +
- "\001\001\000\002\001\001\000\002\001\001\000\004\076" +
- "\u0472\001\001\000\054\003\u0108\021\u0475\064\153\065\051" +
- "\105\u0105\106\063\107\377\110\144\121\106\152\044\155" +
- "\u0100\156\057\161\u0103\201\u046f\226\006\230\021\233\134" +
- "\243\032\244\040\245\047\256\055\001\001\000\002\001" +
- "\001\000\002\001\001\000\002\001\001\000\002\001\001" +
- "\000\004\067\u0477\001\001\000\002\001\001\000\002\001" +
- "\001\000\004\112\u0120\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\136\003\174\004\101\014\u0286\016\u0281\017\132\062" +
- "\167\063\124\064\153\065\051\070\131\074\014\100\016" +
- "\101\100\103\165\104\177\105\204\106\063\107\170\110" +
- "\144\121\106\131\075\133\135\151\130\152\044\153\022" +
- "\154\137\155\077\156\057\157\110\161\070\177\u0283\200" +
- "\u0285\201\025\212\162\213\023\214\053\223\171\225\116" +
- "\226\006\230\021\233\134\240\111\243\032\244\040\245" +
- "\047\256\055\001\001\000\002\001\001\000\002\001\001" +
- "\000\002\001\001\000\026\106\u011f\110\144\121\u011b\164" +
- "\u017e\165\u0182\166\u0172\167\u0488\226\u021d\233\134\241\u0487" +
- "\001\001\000\004\112\u03ac\001\001\000\002\001\001\000" +
- "\006\127\u0423\233\u0422\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\106\003\174" +
- "\004\101\062\167\063\124\064\153\065\051\070\131\074" +
- "\014\100\u0492\105\204\106\063\107\170\110\144\121\106" +
- "\131\075\151\130\152\044\153\022\154\137\155\077\156" +
- "\057\157\110\161\070\201\025\223\171\225\116\226\006" +
- "\230\021\233\134\240\111\243\032\244\040\245\047\256" +
- "\055\001\001\000\002\001\001\000\002\001\001\000\106" +
+ "\256\055\001\001\000\002\001\001\000\056\003\u0108\020" +
+ "\u046e\021\u046c\064\153\065\051\105\u0105\106\063\107\377" +
+ "\110\144\121\106\152\044\155\u0100\156\057\161\u0103\201" +
+ "\u046d\226\006\230\021\233\134\243\032\244\040\245\047" +
+ "\256\055\001\001\000\002\001\001\000\002\001\001\000" +
+ "\004\076\u0470\001\001\000\054\003\u0108\021\u0473\064\153" +
+ "\065\051\105\u0105\106\063\107\377\110\144\121\106\152" +
+ "\044\155\u0100\156\057\161\u0103\201\u046d\226\006\230\021" +
+ "\233\134\243\032\244\040\245\047\256\055\001\001\000" +
+ "\002\001\001\000\002\001\001\000\002\001\001\000\002" +
+ "\001\001\000\004\067\u0475\001\001\000\002\001\001\000" +
+ "\002\001\001\000\004\112\u0120\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\136\003\174\004\101\014\u0286\016\u0281\017" +
+ "\132\062\167\063\124\064\153\065\051\070\131\074\014" +
+ "\100\016\101\100\103\165\104\177\105\204\106\063\107" +
+ "\170\110\144\121\106\131\075\133\135\151\130\152\044" +
+ "\153\022\154\137\155\077\156\057\157\110\161\070\177" +
+ "\u0283\200\u0285\201\025\212\162\213\023\214\053\223\171" +
+ "\225\116\226\006\230\021\233\134\240\111\243\032\244" +
+ "\040\245\047\256\055\001\001\000\002\001\001\000\002" +
+ "\001\001\000\002\001\001\000\026\106\u011f\110\144\121" +
+ "\u011b\164\u017e\165\u0182\166\u0172\167\u0486\226\u021d\233\134" +
+ "\241\u0485\001\001\000\004\112\u03ab\001\001\000\002\001" +
+ "\001\000\006\127\u0421\233\u0420\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\106" +
"\003\174\004\101\062\167\063\124\064\153\065\051\070" +
- "\131\074\014\100\u0495\105\204\106\063\107\170\110\144" +
+ "\131\074\014\100\u0490\105\204\106\063\107\170\110\144" +
"\121\106\131\075\151\130\152\044\153\022\154\137\155" +
"\077\156\057\157\110\161\070\201\025\223\171\225\116" +
"\226\006\230\021\233\134\240\111\243\032\244\040\245" +
"\047\256\055\001\001\000\002\001\001\000\002\001\001" +
- "\000\024\106\u011f\110\144\116\u0498\117\u011a\120\u0117\121" +
- "\u011b\132\u0116\226\u0118\233\134\001\001\000\004\175\u0499" +
- "\001\001\000\006\112\u012e\114\u049a\001\001\000\006\112" +
- "\u0130\176\u049b\001\001\000\004\227\u0131\001\001\000\004" +
- "\215\u049d\001\001\000\004\216\u049e\001\001\000\002\001" +
- "\001\000\004\053\u04a0\001\001\000\020\054\u025d\172\u025c" +
- "\173\u026b\224\u0265\234\u0268\235\u025b\236\u0267\001\001\000" +
- "\002\001\001\000\010\046\u04a9\047\335\056\336\001\001" +
- "\000\032\106\u011f\110\144\115\u04a5\121\u011b\164\u017e\165" +
- "\u0182\166\u0172\167\u0161\226\u0138\233\134\251\u0186\254\u013f" +
- "\001\001\000\002\001\001\000\004\175\u04a6\001\001\000" +
- "\006\112\u012e\114\u04a7\001\001\000\006\112\u0130\176\u04a8" +
- "\001\001\000\004\227\u0131\001\001\000\002\001\001\000" +
- "\002\001\001\000\106\003\174\004\101\062\167\063\124" +
- "\064\153\065\051\070\131\074\014\100\u04ac\105\204\106" +
- "\063\107\170\110\144\121\106\131\075\151\130\152\044" +
- "\153\022\154\137\155\077\156\057\157\110\161\070\201" +
- "\025\223\171\225\116\226\006\230\021\233\134\240\111" +
- "\243\032\244\040\245\047\256\055\001\001\000\002\001" +
- "\001\000\122\003\174\004\101\014\u04b0\017\132\034\u04af" +
- "\062\167\063\124\064\153\065\051\070\131\074\014\100" +
- "\016\101\100\103\165\104\177\105\204\106\063\107\170" +
+ "\000\106\003\174\004\101\062\167\063\124\064\153\065" +
+ "\051\070\131\074\014\100\u0493\105\204\106\063\107\170" +
"\110\144\121\106\131\075\151\130\152\044\153\022\154" +
"\137\155\077\156\057\157\110\161\070\201\025\223\171" +
"\225\116\226\006\230\021\233\134\240\111\243\032\244" +
- "\040\245\047\256\055\001\001\000\004\015\u04b1\001\001" +
- "\000\002\001\001\000\002\001\001\000\136\003\174\004" +
- "\101\014\u0286\016\u0281\017\132\062\167\063\124\064\153" +
- "\065\051\070\131\074\014\100\016\101\100\103\165\104" +
- "\177\105\204\106\063\107\170\110\144\121\106\131\075" +
- "\133\135\151\130\152\044\153\022\154\137\155\077\156" +
- "\057\157\110\161\070\177\u0283\200\u0285\201\025\212\162" +
- "\213\023\214\053\223\171\225\116\226\006\230\021\233" +
- "\134\240\111\243\032\244\040\245\047\256\055\001\001" +
- "\000\002\001\001\000\002\001\001\000\032\106\u011f\110" +
- "\144\115\u04b5\121\u011b\164\u017e\165\u0182\166\u0172\167\u0161" +
- "\226\u0138\233\134\251\u0186\254\u013f\001\001\000\004\175" +
- "\u04b6\001\001\000\006\112\u012e\114\u04b7\001\001\000\006" +
- "\112\u0130\176\u04b8\001\001\000\004\227\u0131\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\u01a0\004\u0197\070" +
- "\u018f\071\u04bf\072\u01e9\073\u019b\151\u019d\161\u018b\250\u0195" +
- "\252\u018c\253\u0191\255\u019f\001\001\000\002\001\001\000" +
- "\032\003\u01a0\004\u0197\070\u018f\071\u04c1\072\u01e9\073\u019b" +
- "\151\u019d\161\u018b\250\u0195\252\u018c\253\u0191\255\u019f\001" +
- "\001\000\002\001\001\000\002\001\001\000\004\015\u04c4" +
+ "\040\245\047\256\055\001\001\000\002\001\001\000\002" +
+ "\001\001\000\024\106\u011f\110\144\116\u0496\117\u011a\120" +
+ "\u0117\121\u011b\132\u0116\226\u0118\233\134\001\001\000\004" +
+ "\175\u0497\001\001\000\006\112\u012e\114\u0498\001\001\000" +
+ "\006\112\u0130\176\u0499\001\001\000\004\227\u0131\001\001" +
+ "\000\004\215\u049b\001\001\000\004\216\u049c\001\001\000" +
+ "\002\001\001\000\004\053\u049e\001\001\000\020\054\u025d" +
+ "\172\u025c\173\u026b\224\u0265\234\u0268\235\u025b\236\u0267\001" +
+ "\001\000\002\001\001\000\010\046\u04a7\047\335\056\336" +
+ "\001\001\000\032\106\u011f\110\144\115\u04a3\121\u011b\164" +
+ "\u017e\165\u0182\166\u0172\167\u0161\226\u0138\233\134\251\u0186" +
+ "\254\u013f\001\001\000\002\001\001\000\004\175\u04a4\001" +
+ "\001\000\006\112\u012e\114\u04a5\001\001\000\006\112\u0130" +
+ "\176\u04a6\001\001\000\004\227\u0131\001\001\000\002\001" +
+ "\001\000\002\001\001\000\106\003\174\004\101\062\167" +
+ "\063\124\064\153\065\051\070\131\074\014\100\u04aa\105" +
+ "\204\106\063\107\170\110\144\121\106\131\075\151\130" +
+ "\152\044\153\022\154\137\155\077\156\057\157\110\161" +
+ "\070\201\025\223\171\225\116\226\006\230\021\233\134" +
+ "\240\111\243\032\244\040\245\047\256\055\001\001\000" +
+ "\002\001\001\000\122\003\174\004\101\014\u04ae\017\132" +
+ "\034\u04ad\062\167\063\124\064\153\065\051\070\131\074" +
+ "\014\100\016\101\100\103\165\104\177\105\204\106\063" +
+ "\107\170\110\144\121\106\131\075\151\130\152\044\153" +
+ "\022\154\137\155\077\156\057\157\110\161\070\201\025" +
+ "\223\171\225\116\226\006\230\021\233\134\240\111\243" +
+ "\032\244\040\245\047\256\055\001\001\000\004\015\u04af" +
+ "\001\001\000\002\001\001\000\002\001\001\000\136\003" +
+ "\174\004\101\014\u0286\016\u0281\017\132\062\167\063\124" +
+ "\064\153\065\051\070\131\074\014\100\016\101\100\103" +
+ "\165\104\177\105\204\106\063\107\170\110\144\121\106" +
+ "\131\075\133\135\151\130\152\044\153\022\154\137\155" +
+ "\077\156\057\157\110\161\070\177\u0283\200\u0285\201\025" +
+ "\212\162\213\023\214\053\223\171\225\116\226\006\230" +
+ "\021\233\134\240\111\243\032\244\040\245\047\256\055" +
+ "\001\001\000\002\001\001\000\002\001\001\000\032\106" +
+ "\u011f\110\144\115\u04b3\121\u011b\164\u017e\165\u0182\166\u0172" +
+ "\167\u0161\226\u0138\233\134\251\u0186\254\u013f\001\001\000" +
+ "\004\175\u04b4\001\001\000\006\112\u012e\114\u04b5\001\001" +
+ "\000\006\112\u0130\176\u04b6\001\001\000\004\227\u0131\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\u01a0\004" +
+ "\u0197\070\u018f\071\u04bd\072\u01e9\073\u019b\151\u019d\161\u018b" +
+ "\250\u0195\252\u018c\253\u0191\255\u019f\001\001\000\002\001" +
+ "\001\000\032\003\u01a0\004\u0197\070\u018f\071\u04bf\072\u01e9" +
+ "\073\u019b\151\u019d\161\u018b\250\u0195\252\u018c\253\u0191\255" +
+ "\u019f\001\001\000\002\001\001\000\002\001\001\000\004" +
+ "\015\u04c2\001\001\000\136\003\174\004\101\014\u0286\016" +
+ "\u0281\017\132\062\167\063\124\064\153\065\051\070\131" +
+ "\074\014\100\016\101\100\103\165\104\177\105\204\106" +
+ "\063\107\170\110\144\121\106\131\075\133\135\151\130" +
+ "\152\044\153\022\154\137\155\077\156\057\157\110\161" +
+ "\070\177\u0283\200\u0285\201\025\212\162\213\023\214\053" +
+ "\223\171\225\116\226\006\230\021\233\134\240\111\243" +
+ "\032\244\040\245\047\256\055\001\001\000\002\001\001" +
+ "\000\002\001\001\000\002\001\001\000\004\015\u04c7\001" +
+ "\001\000\136\003\174\004\101\014\u0286\016\u0281\017\132" +
+ "\062\167\063\124\064\153\065\051\070\131\074\014\100" +
+ "\016\101\100\103\165\104\177\105\204\106\063\107\170" +
+ "\110\144\121\106\131\075\133\135\151\130\152\044\153" +
+ "\022\154\137\155\077\156\057\157\110\161\070\177\u0283" +
+ "\200\u0285\201\025\212\162\213\023\214\053\223\171\225" +
+ "\116\226\006\230\021\233\134\240\111\243\032\244\040" +
+ "\245\047\256\055\001\001\000\002\001\001\000\010\003" +
+ "\u0253\162\u04cb\205\u04ca\001\001\000\004\233\u04d2\001\001" +
+ "\000\010\206\u04cc\207\u04cf\210\u04ce\001\001\000\002\001" +
+ "\001\000\006\003\u0253\162\u04d1\001\001\000\002\001\001" +
+ "\000\004\210\u04d0\001\001\000\002\001\001\000\002\001" +
+ "\001\000\002\001\001\000\002\001\001\000\004\015\u04d5" +
"\001\001\000\136\003\174\004\101\014\u0286\016\u0281\017" +
"\132\062\167\063\124\064\153\065\051\070\131\074\014" +
"\100\016\101\100\103\165\104\177\105\204\106\063\107" +
@@ -1633,32 +1653,20 @@ public class ASTPHP5Parser extends java_cup.runtime.lr_parser {
"\153\022\154\137\155\077\156\057\157\110\161\070\177" +
"\u0283\200\u0285\201\025\212\162\213\023\214\053\223\171" +
"\225\116\226\006\230\021\233\134\240\111\243\032\244" +
- "\040\245\047\256\055\001\001\000\002\001\001\000\002" +
- "\001\001\000\002\001\001\000\004\015\u04c9\001\001\000" +
- "\136\003\174\004\101\014\u0286\016\u0281\017\132\062\167" +
- "\063\124\064\153\065\051\070\131\074\014\100\016\101" +
- "\100\103\165\104\177\105\204\106\063\107\170\110\144" +
- "\121\106\131\075\133\135\151\130\152\044\153\022\154" +
- "\137\155\077\156\057\157\110\161\070\177\u0283\200\u0285" +
- "\201\025\212\162\213\023\214\053\223\171\225\116\226" +
- "\006\230\021\233\134\240\111\243\032\244\040\245\047" +
- "\256\055\001\001\000\002\001\001\000\010\003\u0253\162" +
- "\u04cd\205\u04cc\001\001\000\004\233\u04d4\001\001\000\010" +
- "\206\u04ce\207\u04d1\210\u04d0\001\001\000\002\001\001\000" +
- "\006\003\u0253\162\u04d3\001\001\000\002\001\001\000\004" +
- "\210\u04d2\001\001\000\002\001\001\000\002\001\001\000" +
- "\002\001\001\000\002\001\001\000\004\015\u04d7\001\001" +
- "\000\136\003\174\004\101\014\u0286\016\u0281\017\132\062" +
- "\167\063\124\064\153\065\051\070\131\074\014\100\016" +
- "\101\100\103\165\104\177\105\204\106\063\107\170\110" +
- "\144\121\106\131\075\133\135\151\130\152\044\153\022" +
- "\154\137\155\077\156\057\157\110\161\070\177\u0283\200" +
- "\u0285\201\025\212\162\213\023\214\053\223\171\225\116" +
- "\226\006\230\021\233\134\240\111\243\032\244\040\245" +
- "\047\256\055\001\001\000\010\202\u04da\203\u04dc\204\u04db" +
- "\001\001\000\002\001\001\000\004\211\u04de\001\001\000" +
- "\002\001\001\000\004\204\u04dd\001\001\000\002\001\001" +
- "\000\002\001\001\000\002\001\001\000\004\015\u04e1\001" +
+ "\040\245\047\256\055\001\001\000\010\202\u04d8\203\u04da" +
+ "\204\u04d9\001\001\000\002\001\001\000\004\211\u04dc\001" +
+ "\001\000\002\001\001\000\004\204\u04db\001\001\000\002" +
+ "\001\001\000\002\001\001\000\002\001\001\000\004\015" +
+ "\u04df\001\001\000\136\003\174\004\101\014\u0286\016\u0281" +
+ "\017\132\062\167\063\124\064\153\065\051\070\131\074" +
+ "\014\100\016\101\100\103\165\104\177\105\204\106\063" +
+ "\107\170\110\144\121\106\131\075\133\135\151\130\152" +
+ "\044\153\022\154\137\155\077\156\057\157\110\161\070" +
+ "\177\u0283\200\u0285\201\025\212\162\213\023\214\053\223" +
+ "\171\225\116\226\006\230\021\233\134\240\111\243\032" +
+ "\244\040\245\047\256\055\001\001\000\002\001\001\000" +
+ "\010\003\u0253\162\u04cb\205\u04e2\001\001\000\002\001\001" +
+ "\000\002\001\001\000\002\001\001\000\004\015\u04e6\001" +
"\001\000\136\003\174\004\101\014\u0286\016\u0281\017\132" +
"\062\167\063\124\064\153\065\051\070\131\074\014\100" +
"\016\101\100\103\165\104\177\105\204\106\063\107\170" +
@@ -1666,111 +1674,101 @@ public class ASTPHP5Parser extends java_cup.runtime.lr_parser {
"\022\154\137\155\077\156\057\157\110\161\070\177\u0283" +
"\200\u0285\201\025\212\162\213\023\214\053\223\171\225" +
"\116\226\006\230\021\233\134\240\111\243\032\244\040" +
- "\245\047\256\055\001\001\000\002\001\001\000\010\003" +
- "\u0253\162\u04cd\205\u04e4\001\001\000\002\001\001\000\002" +
- "\001\001\000\002\001\001\000\004\015\u04e8\001\001\000" +
- "\136\003\174\004\101\014\u0286\016\u0281\017\132\062\167" +
- "\063\124\064\153\065\051\070\131\074\014\100\016\101" +
- "\100\103\165\104\177\105\204\106\063\107\170\110\144" +
- "\121\106\131\075\133\135\151\130\152\044\153\022\154" +
- "\137\155\077\156\057\157\110\161\070\177\u0283\200\u0285" +
- "\201\025\212\162\213\023\214\053\223\171\225\116\226" +
- "\006\230\021\233\134\240\111\243\032\244\040\245\047" +
- "\256\055\001\001\000\002\001\001\000\002\001\001\000" +
- "\002\001\001\000\006\127\u0423\233\u0422\001\001\000\002" +
- "\001\001\000\002\001\001\000\112\003\174\004\101\060" +
- "\u04f1\061\u04f2\062\167\063\124\064\153\065\051\070\131" +
- "\074\014\100\u04f0\105\204\106\063\107\170\110\144\121" +
- "\106\131\075\151\130\152\044\153\022\154\137\155\077" +
- "\156\057\157\110\161\070\201\025\223\171\225\116\226" +
- "\006\230\021\233\134\240\111\243\032\244\040\245\047" +
- "\256\055\001\001\000\002\001\001\000\002\001\001\000" +
- "\002\001\001\000\106\003\174\004\101\062\167\063\124" +
- "\064\153\065\051\070\131\074\014\100\u04f4\105\204\106" +
- "\063\107\170\110\144\121\106\131\075\151\130\152\044" +
- "\153\022\154\137\155\077\156\057\157\110\161\070\201" +
- "\025\223\171\225\116\226\006\230\021\233\134\240\111" +
- "\243\032\244\040\245\047\256\055\001\001\000\002\001" +
- "\001\000\112\003\174\004\101\060\u04f6\061\u04f2\062\167" +
- "\063\124\064\153\065\051\070\131\074\014\100\u04f0\105" +
+ "\245\047\256\055\001\001\000\002\001\001\000\002\001" +
+ "\001\000\002\001\001\000\006\127\u0421\233\u0420\001\001" +
+ "\000\002\001\001\000\002\001\001\000\112\003\174\004" +
+ "\101\060\u04ef\061\u04f0\062\167\063\124\064\153\065\051" +
+ "\070\131\074\014\100\u04ee\105\204\106\063\107\170\110" +
+ "\144\121\106\131\075\151\130\152\044\153\022\154\137" +
+ "\155\077\156\057\157\110\161\070\201\025\223\171\225" +
+ "\116\226\006\230\021\233\134\240\111\243\032\244\040" +
+ "\245\047\256\055\001\001\000\002\001\001\000\002\001" +
+ "\001\000\002\001\001\000\106\003\174\004\101\062\167" +
+ "\063\124\064\153\065\051\070\131\074\014\100\u04f2\105" +
"\204\106\063\107\170\110\144\121\106\131\075\151\130" +
"\152\044\153\022\154\137\155\077\156\057\157\110\161" +
"\070\201\025\223\171\225\116\226\006\230\021\233\134" +
"\240\111\243\032\244\040\245\047\256\055\001\001\000" +
- "\002\001\001\000\112\003\174\004\101\060\u04f8\061\u04f2" +
+ "\002\001\001\000\112\003\174\004\101\060\u04f4\061\u04f0" +
"\062\167\063\124\064\153\065\051\070\131\074\014\100" +
- "\u04f0\105\204\106\063\107\170\110\144\121\106\131\075" +
+ "\u04ee\105\204\106\063\107\170\110\144\121\106\131\075" +
"\151\130\152\044\153\022\154\137\155\077\156\057\157" +
"\110\161\070\201\025\223\171\225\116\226\006\230\021" +
"\233\134\240\111\243\032\244\040\245\047\256\055\001" +
- "\001\000\002\001\001\000\122\003\174\004\101\014\u04fc" +
- "\017\132\025\u04fa\062\167\063\124\064\153\065\051\070" +
- "\131\074\014\100\016\101\100\103\165\104\177\105\204" +
- "\106\063\107\170\110\144\121\106\131\075\151\130\152" +
- "\044\153\022\154\137\155\077\156\057\157\110\161\070" +
- "\201\025\223\171\225\116\226\006\230\021\233\134\240" +
- "\111\243\032\244\040\245\047\256\055\001\001\000\002" +
- "\001\001\000\004\015\u04fd\001\001\000\002\001\001\000" +
- "\136\003\174\004\101\014\u0286\016\u0281\017\132\062\167" +
- "\063\124\064\153\065\051\070\131\074\014\100\016\101" +
- "\100\103\165\104\177\105\204\106\063\107\170\110\144" +
- "\121\106\131\075\133\135\151\130\152\044\153\022\154" +
- "\137\155\077\156\057\157\110\161\070\177\u0283\200\u0285" +
- "\201\025\212\162\213\023\214\053\223\171\225\116\226" +
- "\006\230\021\233\134\240\111\243\032\244\040\245\047" +
- "\256\055\001\001\000\002\001\001\000\002\001\001\000" +
- "\106\003\174\004\101\062\u0502\063\124\064\153\065\051" +
- "\070\131\074\014\100\220\105\204\106\063\107\170\110" +
- "\144\121\106\131\075\151\130\152\044\153\022\154\137" +
- "\155\077\156\057\157\110\161\070\201\u0501\223\171\225" +
+ "\001\000\002\001\001\000\112\003\174\004\101\060\u04f6" +
+ "\061\u04f0\062\167\063\124\064\153\065\051\070\131\074" +
+ "\014\100\u04ee\105\204\106\063\107\170\110\144\121\106" +
+ "\131\075\151\130\152\044\153\022\154\137\155\077\156" +
+ "\057\157\110\161\070\201\025\223\171\225\116\226\006" +
+ "\230\021\233\134\240\111\243\032\244\040\245\047\256" +
+ "\055\001\001\000\002\001\001\000\122\003\174\004\101" +
+ "\014\u04fa\017\132\025\u04f8\062\167\063\124\064\153\065" +
+ "\051\070\131\074\014\100\016\101\100\103\165\104\177" +
+ "\105\204\106\063\107\170\110\144\121\106\131\075\151" +
+ "\130\152\044\153\022\154\137\155\077\156\057\157\110" +
+ "\161\070\201\025\223\171\225\116\226\006\230\021\233" +
+ "\134\240\111\243\032\244\040\245\047\256\055\001\001" +
+ "\000\002\001\001\000\004\015\u04fb\001\001\000\002\001" +
+ "\001\000\136\003\174\004\101\014\u0286\016\u0281\017\132" +
+ "\062\167\063\124\064\153\065\051\070\131\074\014\100" +
+ "\016\101\100\103\165\104\177\105\204\106\063\107\170" +
+ "\110\144\121\106\131\075\133\135\151\130\152\044\153" +
+ "\022\154\137\155\077\156\057\157\110\161\070\177\u0283" +
+ "\200\u0285\201\025\212\162\213\023\214\053\223\171\225" +
"\116\226\006\230\021\233\134\240\111\243\032\244\040" +
"\245\047\256\055\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\010\003\u0507\010" +
- "\u0509\011\u0529\001\001\000\002\001\001\000\004\003\u0512" +
- "\001\001\000\010\003\u0507\010\u0509\011\u0510\001\001\000" +
- "\002\001\001\000\006\003\u0507\010\u050f\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\u051c\005\u051b\006\u051a\007" +
- "\u0517\001\001\000\002\001\001\000\004\003\u0526\001\001" +
- "\000\004\003\u0523\001\001\000\004\076\u0521\001\001\000" +
+ "\001\000\106\003\174\004\101\062\u0500\063\124\064\153" +
+ "\065\051\070\131\074\014\100\220\105\204\106\063\107" +
+ "\170\110\144\121\106\131\075\151\130\152\044\153\022" +
+ "\154\137\155\077\156\057\157\110\161\070\201\u04ff\223" +
+ "\171\225\116\226\006\230\021\233\134\240\111\243\032" +
+ "\244\040\245\047\256\055\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\006\003\u051c\007\u0522\001" +
- "\001\000\002\001\001\000\002\001\001\000\002\001\001" +
+ "\001\001\000\002\001\001\000\002\001\001\000\010\003" +
+ "\u0505\010\u0507\011\u0527\001\001\000\002\001\001\000\004" +
+ "\003\u0510\001\001\000\010\003\u0505\010\u0507\011\u050e\001" +
+ "\001\000\002\001\001\000\006\003\u0505\010\u050d\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\u051a\005\u0519\006" +
+ "\u0518\007\u0515\001\001\000\002\001\001\000\004\003\u0524" +
+ "\001\001\000\004\003\u0521\001\001\000\004\076\u051f\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\u051a\007" +
+ "\u0520\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\u051c\005\u052f\006\u051a\007\u0517\001\001" +
- "\000\002\001\001\000\002\001\001\000\002\001\001\000" +
- "\002\001\001\000\116\003\174\004\101\062\167\063\124" +
- "\064\153\065\051\070\131\074\014\100\u02f4\105\204\106" +
- "\063\107\170\110\144\121\106\122\u0534\123\u02f5\124\u02f7" +
- "\125\u02f6\131\075\151\130\152\044\153\022\154\137\155" +
- "\077\156\057\157\110\161\070\201\025\223\171\225\116" +
- "\226\006\230\021\233\134\240\111\243\032\244\040\245" +
- "\047\256\055\001\001\000\002\001\001\000\002\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" +
- "\106\003\174\004\101\062\167\063\124\064\153\065\051" +
- "\070\131\074\014\100\u053a\105\204\106\063\107\170\110" +
- "\144\121\106\131\075\151\130\152\044\153\022\154\137" +
- "\155\077\156\057\157\110\161\070\201\025\223\171\225" +
- "\116\226\006\230\021\233\134\240\111\243\032\244\040" +
- "\245\047\256\055\001\001\000\002\001\001\000\002\001" +
- "\001\000\002\001\001\000\054\003\u0108\064\153\065\051" +
- "\105\u0105\106\063\107\377\110\144\121\106\152\044\155" +
- "\u0100\156\057\161\u0103\201\u0540\223\u053f\226\006\230\021" +
- "\233\134\243\032\244\040\245\047\256\055\001\001\000" +
- "\002\001\001\000\002\001\001\000\002\001\001\000\106" +
- "\003\174\004\101\062\167\063\124\064\153\065\051\070" +
- "\131\074\014\100\u0542\105\204\106\063\107\170\110\144" +
- "\121\106\131\075\151\130\152\044\153\022\154\137\155" +
- "\077\156\057\157\110\161\070\201\025\223\171\225\116" +
- "\226\006\230\021\233\134\240\111\243\032\244\040\245" +
- "\047\256\055\001\001\000\002\001\001\000\002\001\001" +
- "\000\004\051\u0546\001\001\000\002\001\001\000\002\001" +
- "\001\000\010\046\u0548\047\335\056\336\001\001\000\002" +
- "\001\001\000\002\001\001\000\002\001\001" });
+ "\002\001\001\000\012\003\u051a\005\u052d\006\u0518\007\u0515" +
+ "\001\001\000\002\001\001\000\002\001\001\000\002\001" +
+ "\001\000\002\001\001\000\116\003\174\004\101\062\167" +
+ "\063\124\064\153\065\051\070\131\074\014\100\u02f3\105" +
+ "\204\106\063\107\170\110\144\121\106\122\u0532\123\u02f4" +
+ "\124\u02f6\125\u02f5\131\075\151\130\152\044\153\022\154" +
+ "\137\155\077\156\057\157\110\161\070\201\025\223\171" +
+ "\225\116\226\006\230\021\233\134\240\111\243\032\244" +
+ "\040\245\047\256\055\001\001\000\002\001\001\000\002" +
+ "\001\001\000\002\001\001\000\002\001\001\000\002\001" +
+ "\001\000\106\003\174\004\101\062\167\063\124\064\153" +
+ "\065\051\070\131\074\014\100\u0538\105\204\106\063\107" +
+ "\170\110\144\121\106\131\075\151\130\152\044\153\022" +
+ "\154\137\155\077\156\057\157\110\161\070\201\025\223" +
+ "\171\225\116\226\006\230\021\233\134\240\111\243\032" +
+ "\244\040\245\047\256\055\001\001\000\002\001\001\000" +
+ "\002\001\001\000\002\001\001\000\054\003\u0108\064\153" +
+ "\065\051\105\u0105\106\063\107\377\110\144\121\106\152" +
+ "\044\155\u0100\156\057\161\u0103\201\u053e\223\u053d\226\006" +
+ "\230\021\233\134\243\032\244\040\245\047\256\055\001" +
+ "\001\000\002\001\001\000\002\001\001\000\002\001\001" +
+ "\000\106\003\174\004\101\062\167\063\124\064\153\065" +
+ "\051\070\131\074\014\100\u0540\105\204\106\063\107\170" +
+ "\110\144\121\106\131\075\151\130\152\044\153\022\154" +
+ "\137\155\077\156\057\157\110\161\070\201\025\223\171" +
+ "\225\116\226\006\230\021\233\134\240\111\243\032\244" +
+ "\040\245\047\256\055\001\001\000\002\001\001\000\002" +
+ "\001\001\000\004\051\u0544\001\001\000\002\001\001\000" +
+ "\002\001\001\000\010\046\u0546\047\335\056\336\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;}
@@ -2016,13 +2014,14 @@ new EncodedActionTable14().getTableData()
}
}
- /**
+ /**
* Report a fatal error. This method takes a message string and an additional object
* (to be used by specializations implemented in subclasses).
* The super class reports the error then throws an exception.
* @param message an error message.
* @param info an extra object reserved for use by specialized subclasses.
*/
+
public void report_fatal_error(String message, Object info) throws Exception {
if (errorHandler != null) {
errorHandler.handleError(ParserErrorHandler.Type.FATAL_PARSER_ERROR, null, cur_token, null);
@@ -5403,15 +5402,12 @@ switch (CUP$ASTPHP5Parser$act_num) {
return CUP$ASTPHP5Parser$result;
/*. . . . . . . . . . . . . . . . . . . .*/
- case 191: // trait_statement ::= variable_modifiers optional_class_type class_variable_declaration T_SEMICOLON
+ case 191: // trait_statement ::= variable_modifiers class_variable_declaration T_SEMICOLON
{
Statement RESULT =null;
- int modifierleft = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-3)).left;
- int modifierright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-3)).right;
- Integer modifier = (Integer)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-3)).value;
- int fieldTypeleft = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-2)).left;
- int fieldTyperight = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-2)).right;
- Expression fieldType = (Expression)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-2)).value;
+ int modifierleft = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-2)).left;
+ int modifierright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-2)).right;
+ Integer modifier = (Integer)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-2)).value;
int decListleft = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-1)).left;
int decListright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-1)).right;
List decList = (List)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-1)).value;
@@ -5419,10 +5415,10 @@ switch (CUP$ASTPHP5Parser$act_num) {
int endright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
Object end = (Object)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
- FieldsDeclaration fieldsDeclaration = new FieldsDeclaration(modifierleft, endright, modifier.intValue(), fieldType, decList);
+ FieldsDeclaration fieldsDeclaration = new FieldsDeclaration(modifierleft, endright, modifier.intValue(), decList);
RESULT = fieldsDeclaration;
- CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("trait_statement",99, ((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("trait_statement",99, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-2)), ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()), RESULT);
}
return CUP$ASTPHP5Parser$result;
@@ -6941,15 +6937,12 @@ switch (CUP$ASTPHP5Parser$act_num) {
return CUP$ASTPHP5Parser$result;
/*. . . . . . . . . . . . . . . . . . . .*/
- case 277: // class_statement ::= variable_modifiers optional_class_type class_variable_declaration T_SEMICOLON
+ case 277: // class_statement ::= variable_modifiers class_variable_declaration T_SEMICOLON
{
Statement RESULT =null;
- int modifierleft = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-3)).left;
- int modifierright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-3)).right;
- Integer modifier = (Integer)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-3)).value;
- int fieldTypeleft = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-2)).left;
- int fieldTyperight = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-2)).right;
- Expression fieldType = (Expression)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-2)).value;
+ int modifierleft = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-2)).left;
+ int modifierright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-2)).right;
+ Integer modifier = (Integer)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-2)).value;
int decListleft = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-1)).left;
int decListright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-1)).right;
List decList = (List)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-1)).value;
@@ -6957,10 +6950,10 @@ switch (CUP$ASTPHP5Parser$act_num) {
int endright = ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.peek()).right;
Object end = (Object)((java_cup.runtime.Symbol) CUP$ASTPHP5Parser$stack.peek()).value;
- FieldsDeclaration fieldsDeclaration = new FieldsDeclaration(modifierleft, endright, modifier.intValue(), fieldType, decList);
+ FieldsDeclaration fieldsDeclaration = new FieldsDeclaration(modifierleft, endright, modifier.intValue(), decList);
RESULT = fieldsDeclaration;
- CUP$ASTPHP5Parser$result = parser.getSymbolFactory().newSymbol("class_statement",42, ((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("class_statement",42, ((java_cup.runtime.Symbol)CUP$ASTPHP5Parser$stack.elementAt(CUP$ASTPHP5Parser$top-2)), ((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 1747590..52d1eae 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
-// Thu Jun 13 22:43:48 JST 2019
+// Sun Apr 07 22:35:32 JST 2019
//----------------------------------------------------
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 ff38bb5..810af4e 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\u0549\000\256\002\uffaa\003\uffaa\004\uffaa\005\uffaa\006");
+ sb.append("\000\u0547\000\256\002\uffaa\003\uffaa\004\uffaa\005\uffaa\006");
sb.append("\uffaa\007\uffaa\010\uffaa\011\uffaa\012\uffaa\014\uffaa\015\uffaa");
sb.append("\016\uffaa\017\uffaa\020\uffaa\021\uffaa\023\uffaa\025\uffaa\027");
sb.append("\uffaa\032\uffaa\034\uffaa\040\uffaa\041\uffaa\042\uffaa\043\uffaa");
@@ -41,7 +41,7 @@ public class EncodedActionTable1 {
sb.append("\174\uffaa\175\uffaa\177\uffaa\200\uffaa\201\uffaa\202\uffaa\203");
sb.append("\uffaa\204\uffaa\205\uffaa\206\uffaa\207\uffaa\210\uffaa\211\uffaa");
sb.append("\213\uffaa\217\uffaa\220\uffaa\221\uffaa\225\uffaa\230\uffaa\231");
- sb.append("\uffaa\232\uffaa\233\uffaa\235\uffaa\001\002\000\004\002\u054b");
+ sb.append("\uffaa\232\uffaa\233\uffaa\235\uffaa\001\002\000\004\002\u0549");
sb.append("\001\002\000\256\002\001\003\142\004\174\005\211\006");
sb.append("\127\007\011\010\036\011\063\012\072\014\113\015\160");
sb.append("\016\156\017\150\020\144\021\051\023\035\025\121\027");
@@ -61,7 +61,7 @@ public class EncodedActionTable1 {
sb.append("\153\ufe26\154\ufe26\155\ufe26\156\ufe26\157\ufe26\160\ufe26\161");
sb.append("\ufe26\162\ufe26\163\ufe26\164\ufe26\165\ufe26\166\ufe26\167\ufe26");
sb.append("\170\ufe26\171\ufe26\172\ufe26\173\ufe26\176\ufe26\212\ufe26\226");
- sb.append("\ufe26\227\ufe26\237\ufe26\242\ufe26\001\002\000\004\225\u0548");
+ sb.append("\ufe26\227\ufe26\237\ufe26\242\ufe26\001\002\000\004\225\u0546");
sb.append("\001\002\000\304\002\uff6c\003\uff6c\004\uff6c\005\uff6c\006");
sb.append("\uff6c\007\uff6c\010\uff6c\011\uff6c\012\uff6c\014\uff6c\015\uff6c");
sb.append("\016\uff6c\017\uff6c\020\uff6c\021\uff6c\022\uff6c\023\uff6c\024");
@@ -83,7 +83,7 @@ public class EncodedActionTable1 {
sb.append("\155\ufe29\156\ufe29\157\ufe29\160\ufe29\161\ufe29\162\ufe29\163");
sb.append("\ufe29\164\ufe29\165\ufe29\166\ufe29\167\ufe29\170\ufe29\171\ufe29");
sb.append("\172\ufe29\173\ufe29\176\ufe29\212\ufe29\226\ufe29\227\ufe29\237");
- sb.append("\ufe29\242\ufe29\001\002\000\006\012\u053d\230\u053e\001\002");
+ sb.append("\ufe29\242\ufe29\001\002\000\006\012\u053b\230\u053c\001\002");
sb.append("\000\270\004\174\006\127\007\011\010\214\011\063\012");
sb.append("\072\015\160\016\156\031\ufdd0\032\123\033\ufdd0\043\217");
sb.append("\046\013\047\046\060\177\061\032\070\ufdd0\071\202\072");
@@ -98,7 +98,7 @@ public class EncodedActionTable1 {
sb.append("\030\202\162\203\042\204\153\205\110\206\164\207\106");
sb.append("\210\040\211\061\212\ufdd0\213\114\217\215\225\203\226");
sb.append("\ufdd0\227\ufdd0\230\120\231\134\232\070\233\143\237\ufdd0");
- sb.append("\242\ufdd0\001\002\000\004\225\u0534\001\002\000\114\031");
+ sb.append("\242\ufdd0\001\002\000\004\225\u0532\001\002\000\114\031");
sb.append("\ufe5e\033\ufe5e\070\ufe5e\107\ufe5e\124\ufe5e\125\ufe5e\126\ufe5e");
sb.append("\127\ufe5e\145\ufe5e\146\ufe5e\147\ufe5e\150\ufe5e\151\ufe5e\152");
sb.append("\ufe5e\153\ufe5e\154\ufe5e\155\ufe5e\156\ufe5e\157\ufe5e\160\ufe5e");
@@ -119,7 +119,7 @@ public class EncodedActionTable1 {
sb.append("\155\251\156\232\157\247\160\264\161\263\162\245\163");
sb.append("\243\164\262\165\256\166\252\167\267\170\244\171\255");
sb.append("\172\253\173\234\176\241\212\ufdc4\226\ufdc4\227\ufdc4\237");
- sb.append("\240\242\233\001\002\000\004\063\u0532\001\002\000\114");
+ sb.append("\240\242\233\001\002\000\004\063\u0530\001\002\000\114");
sb.append("\031\ufe24\033\ufe24\070\ufe24\107\ufe24\124\ufe24\125\ufe24\126");
sb.append("\ufe24\127\ufe24\145\ufe24\146\ufe24\147\ufe24\150\ufe24\151\ufe24");
sb.append("\152\ufe24\153\ufe24\154\ufe24\155\ufe24\156\ufe24\157\ufe24\160");
@@ -180,7 +180,7 @@ public class EncodedActionTable1 {
sb.append("\ufdc1\166\ufdc1\167\ufdc1\170\ufdc1\171\ufdc1\172\ufdc1\173\ufdc1");
sb.append("\176\ufdc1\177\ufdbf\200\ufdbf\212\ufdc1\226\ufdc1\227\ufdc1\237");
sb.append("\ufdc1\240\347\242\ufdc1\243\361\001\002\000\020\010\314");
- sb.append("\016\u028a\043\u0509\044\u050c\114\u050b\116\065\225\u0289\001");
+ sb.append("\016\u028a\043\u0507\044\u050a\114\u0509\116\065\225\u0289\001");
sb.append("\002\000\156\004\174\006\127\007\011\010\214\011\063");
sb.append("\012\072\015\160\016\156\032\123\043\217\060\177\061");
sb.append("\032\071\202\072\014\074\021\075\141\076\053\077\055");
@@ -198,7 +198,7 @@ public class EncodedActionTable1 {
sb.append("\103\174\176\175\016\177\062\200\204\201\030\202\162");
sb.append("\203\042\204\153\205\110\206\164\207\106\210\040\211");
sb.append("\061\213\114\217\215\225\220\230\120\231\134\232\070");
- sb.append("\233\143\001\002\000\004\225\u0501\001\002\000\166\031");
+ sb.append("\233\143\001\002\000\004\225\u04ff\001\002\000\166\031");
sb.append("\ufd91\033\ufd91\067\ufd91\070\ufd91\106\u0112\107\ufd91\110\ufd91");
sb.append("\124\ufd91\125\ufd91\126\ufd91\127\ufd91\131\ufd91\132\ufd91\133");
sb.append("\ufd91\134\ufd91\135\ufd91\136\ufd91\137\ufd91\140\ufd91\141\ufd91");
@@ -208,13 +208,13 @@ public class EncodedActionTable1 {
sb.append("\ufd91\166\ufd91\167\ufd91\170\ufd91\171\ufd91\172\ufd91\173\ufd91");
sb.append("\176\ufd91\177\ufd91\200\ufd91\211\u0113\212\ufd91\225\ufe43\226");
sb.append("\ufd91\227\ufd91\237\ufd91\240\ufd91\242\ufd91\243\ufd91\001\002");
- sb.append("\000\004\010\uff3e\001\002\000\004\225\u04f0\001\002\000");
+ sb.append("\000\004\010\uff3e\001\002\000\004\225\u04ee\001\002\000");
sb.append("\112\031\uffff\106\u0112\110\uffff\114\uffff\125\uffff\126\uffff");
sb.append("\127\uffff\145\uffff\146\uffff\147\uffff\150\uffff\151\uffff\152");
sb.append("\uffff\153\uffff\154\uffff\155\uffff\156\uffff\157\uffff\160\uffff");
sb.append("\161\uffff\162\uffff\163\uffff\164\uffff\165\uffff\166\uffff\167");
sb.append("\uffff\170\uffff\171\uffff\172\uffff\173\uffff\176\uffff\211\u0113");
- sb.append("\225\uffff\227\u04ef\237\uffff\242\uffff\001\002\000\014\012");
+ sb.append("\225\uffff\227\u04ed\237\uffff\242\uffff\001\002\000\014\012");
sb.append("\ufd70\015\ufd70\103\ufd70\104\ufd70\105\ufd70\001\002\000\156");
sb.append("\004\174\006\127\007\011\010\214\011\063\012\072\015");
sb.append("\160\016\156\032\123\043\217\060\177\061\032\071\202");
@@ -247,7 +247,7 @@ public class EncodedActionTable1 {
sb.append("\153\ufe25\154\ufe25\155\ufe25\156\ufe25\157\ufe25\160\ufe25\161");
sb.append("\ufe25\162\ufe25\163\ufe25\164\ufe25\165\ufe25\166\ufe25\167\ufe25");
sb.append("\170\ufe25\171\ufe25\172\ufe25\173\ufe25\176\ufe25\212\ufe25\226");
- sb.append("\ufe25\227\ufe25\237\ufe25\242\ufe25\001\002\000\004\106\u04c4");
+ sb.append("\ufe25\227\ufe25\237\ufe25\242\ufe25\001\002\000\004\106\u04c2");
sb.append("\001\002\000\156\031\ufdb9\033\ufdb9\070\ufdb9\107\ufdb9\124");
sb.append("\ufdb9\125\ufdb9\126\ufdb9\127\ufdb9\131\ufdb9\132\ufdb9\133\ufdb9");
sb.append("\134\ufdb9\135\ufdb9\136\ufdb9\137\ufdb9\140\ufdb9\141\ufdb9\142");
@@ -265,9 +265,9 @@ public class EncodedActionTable1 {
sb.append("\170\103\174\176\175\016\177\062\200\204\201\030\202");
sb.append("\162\203\042\204\153\205\110\206\164\207\106\210\040");
sb.append("\211\061\213\114\217\215\225\220\230\120\231\134\232");
- sb.append("\070\233\143\001\002\000\010\012\u04ba\043\u0344\110\ufe3d");
+ sb.append("\070\233\143\001\002\000\010\012\u04b8\043\u0343\110\ufe3d");
sb.append("\001\002\000\160\031\ufd98\033\ufd98\067\ufd98\070\ufd98\107");
- sb.append("\ufd98\110\u04b5\124\ufd98\125\ufd98\126\ufd98\127\ufd98\131\ufd98");
+ sb.append("\ufd98\110\u04b3\124\ufd98\125\ufd98\126\ufd98\127\ufd98\131\ufd98");
sb.append("\132\ufd98\133\ufd98\134\ufd98\135\ufd98\136\ufd98\137\ufd98\140");
sb.append("\ufd98\141\ufd98\142\ufd98\143\ufd98\144\ufd98\145\ufd98\146\ufd98");
sb.append("\147\ufd98\150\ufd98\151\ufd98\152\ufd98\153\ufd98\154\ufd98\155");
@@ -275,29 +275,29 @@ public class EncodedActionTable1 {
sb.append("\164\ufd98\165\ufd98\166\ufd98\167\ufd98\170\ufd98\171\ufd98\172");
sb.append("\ufd98\173\ufd98\176\ufd98\177\ufd98\200\ufd98\212\ufd98\226\ufd98");
sb.append("\227\ufd98\237\ufd98\240\ufd98\242\ufd98\243\ufd98\001\002\000");
- sb.append("\004\225\u04ac\001\002\000\166\031\ufda4\033\ufda4\067\ufda4");
- sb.append("\070\ufda4\106\u0112\107\ufda4\110\u04a4\124\ufda4\125\ufda4\126");
+ sb.append("\004\225\u04aa\001\002\000\166\031\ufda4\033\ufda4\067\ufda4");
+ sb.append("\070\ufda4\106\u0112\107\ufda4\110\u04a2\124\ufda4\125\ufda4\126");
sb.append("\ufda4\127\ufda4\131\ufda4\132\ufda4\133\ufda4\134\ufda4\135\ufda4");
sb.append("\136\ufda4\137\ufda4\140\ufda4\141\ufda4\142\ufda4\143\ufda4\144");
sb.append("\ufda4\145\ufda4\146\ufda4\147\ufda4\150\ufda4\151\ufda4\152\ufda4");
sb.append("\153\ufda4\154\ufda4\155\ufda4\156\ufda4\157\ufda4\160\ufda4\161");
sb.append("\ufda4\162\ufda4\163\ufda4\164\ufda4\165\ufda4\166\ufda4\167\ufda4");
sb.append("\170\ufda4\171\ufda4\172\ufda4\173\ufda4\176\ufda4\177\ufda4\200");
- sb.append("\ufda4\211\u0113\212\ufda4\225\u04a3\226\ufda4\227\ufda4\237\ufda4");
+ sb.append("\ufda4\211\u0113\212\ufda4\225\u04a1\226\ufda4\227\ufda4\237\ufda4");
sb.append("\240\ufda4\242\ufda4\243\ufda4\001\002\000\114\031\ufe22\033");
sb.append("\ufe22\070\ufe22\107\ufe22\124\ufe22\125\ufe22\126\ufe22\127\ufe22");
sb.append("\145\ufe22\146\ufe22\147\ufe22\150\ufe22\151\ufe22\152\ufe22\153");
sb.append("\ufe22\154\ufe22\155\ufe22\156\ufe22\157\ufe22\160\ufe22\161\ufe22");
sb.append("\162\ufe22\163\ufe22\164\ufe22\165\ufe22\166\ufe22\167\ufe22\170");
sb.append("\ufe22\171\ufe22\172\ufe22\173\ufe22\176\ufe22\212\ufe22\226\ufe22");
- sb.append("\227\ufe22\237\ufe22\242\ufe22\001\002\000\004\010\u049d\001");
+ sb.append("\227\ufe22\237\ufe22\242\ufe22\001\002\000\004\010\u049b\001");
sb.append("\002\000\114\031\ufe21\033\ufe21\070\ufe21\107\ufe21\124\ufe21");
sb.append("\125\ufe21\126\ufe21\127\ufe21\145\ufe21\146\ufe21\147\ufe21\150");
sb.append("\ufe21\151\ufe21\152\ufe21\153\ufe21\154\ufe21\155\ufe21\156\ufe21");
sb.append("\157\ufe21\160\ufe21\161\ufe21\162\ufe21\163\ufe21\164\ufe21\165");
sb.append("\ufe21\166\ufe21\167\ufe21\170\ufe21\171\ufe21\172\ufe21\173\ufe21");
sb.append("\176\ufe21\212\ufe21\226\ufe21\227\ufe21\237\ufe21\242\ufe21\001");
- sb.append("\002\000\156\031\ufdb8\033\ufdb8\067\u0498\070\ufdb8\107\ufdb8");
+ sb.append("\002\000\156\031\ufdb8\033\ufdb8\067\u0496\070\ufdb8\107\ufdb8");
sb.append("\124\ufdb8\125\ufdb8\126\ufdb8\127\ufdb8\131\ufdb8\132\ufdb8\133");
sb.append("\ufdb8\134\ufdb8\135\ufdb8\136\ufdb8\137\ufdb8\140\ufdb8\141\ufdb8");
sb.append("\142\ufdb8\143\ufdb8\144\ufdb8\145\ufdb8\146\ufdb8\147\ufdb8\150");
@@ -305,7 +305,7 @@ public class EncodedActionTable1 {
sb.append("\157\ufdb8\160\ufdb8\161\ufdb8\162\ufdb8\163\ufdb8\164\ufdb8\165");
sb.append("\ufdb8\166\ufdb8\167\ufdb8\170\ufdb8\171\ufdb8\172\ufdb8\173\ufdb8");
sb.append("\176\ufdb8\177\ufdb8\200\ufdb8\212\ufdb8\226\ufdb8\227\ufdb8\237");
- sb.append("\ufdb8\240\ufdb8\242\ufdb8\243\ufdb8\001\002\000\004\225\u0495");
+ sb.append("\ufdb8\240\ufdb8\242\ufdb8\243\ufdb8\001\002\000\004\225\u0493");
sb.append("\001\002\000\166\031\ufd92\033\ufd92\067\ufd92\070\ufd92\106");
sb.append("\u0112\107\ufd92\110\ufd92\124\ufd92\125\ufd92\126\ufd92\127\ufd92");
sb.append("\131\ufd92\132\ufd92\133\ufd92\134\ufd92\135\ufd92\136\ufd92\137");
@@ -317,10 +317,10 @@ public class EncodedActionTable1 {
sb.append("\212\ufd92\225\ufd92\226\ufd92\227\ufd92\237\ufd92\240\ufd92\242");
sb.append("\ufd92\243\ufd92\001\002\000\164\004\174\006\127\007\011");
sb.append("\010\214\011\063\012\072\015\160\016\156\032\123\043");
- sb.append("\217\060\177\061\032\071\u02fa\072\014\074\021\075\141");
+ sb.append("\217\060\177\061\032\071\u02f9\072\014\074\021\075\141");
sb.append("\076\053\077\055\100\161\101\006\102\037\111\216\112");
sb.append("\155\113\043\114\077\116\065\117\031\120\104\121\057");
- sb.append("\122\152\123\126\124\ufd7a\130\074\153\u02f4\167\124\170");
+ sb.append("\122\152\123\126\124\ufd7a\130\074\153\u02f3\167\124\170");
sb.append("\103\174\176\175\016\177\062\200\204\201\030\202\162");
sb.append("\203\042\204\153\205\110\206\164\207\106\210\040\211");
sb.append("\061\212\ufd7a\213\114\217\215\225\220\230\120\231\134");
@@ -354,7 +354,7 @@ public class EncodedActionTable1 {
sb.append("\202\072\014\074\021\075\141\076\053\077\055\100\161");
sb.append("\101\006\102\037\111\216\112\155\113\043\114\077\116");
sb.append("\065\117\031\120\104\121\057\122\152\123\126\130\074");
- sb.append("\146\u048c\167\124\170\103\174\176\175\016\177\062\200");
+ sb.append("\146\u048a\167\124\170\103\174\176\175\016\177\062\200");
sb.append("\204\201\030\202\162\203\042\204\153\205\110\206\164");
sb.append("\207\106\210\040\211\061\213\114\217\215\225\220\230");
sb.append("\120\231\134\232\070\233\143\001\002\000\260\002\uffa6");
@@ -372,7 +372,7 @@ public class EncodedActionTable1 {
sb.append("\uffa6\206\uffa6\207\uffa6\210\uffa6\211\uffa6\213\uffa6\217\uffa6");
sb.append("\220\uffa6\221\uffa6\225\uffa6\230\uffa6\231\uffa6\232\uffa6\233");
sb.append("\uffa6\235\uffa6\001\002\000\014\012\ufd70\015\ufd70\104\ufd70");
- sb.append("\105\ufd70\232\ufd70\001\002\000\004\110\u0487\001\002\000");
+ sb.append("\105\ufd70\232\ufd70\001\002\000\004\110\u0485\001\002\000");
sb.append("\204\012\ufd54\015\ufd54\031\ufd54\033\ufd54\067\ufd54\070\ufd54");
sb.append("\103\ufd54\104\ufd54\105\ufd54\106\ufd54\107\ufd54\110\ufd54\124");
sb.append("\ufd54\125\ufd54\126\ufd54\127\ufd54\131\ufd54\132\ufd54\133\ufd54");
@@ -383,7 +383,7 @@ public class EncodedActionTable1 {
sb.append("\166\ufd54\167\ufd54\170\ufd54\171\ufd54\172\ufd54\173\ufd54\176");
sb.append("\ufd54\177\ufd54\200\ufd54\211\ufd54\212\ufd54\225\ufd54\226\ufd54");
sb.append("\227\ufd54\231\ufd54\232\ufd54\237\ufd54\240\ufd54\242\ufd54\243");
- sb.append("\ufd54\001\002\000\004\063\u0486\001\002\000\156\004\174");
+ sb.append("\ufd54\001\002\000\004\063\u0484\001\002\000\156\004\174");
sb.append("\006\127\007\011\010\214\011\063\012\072\015\160\016");
sb.append("\156\032\123\043\217\060\177\061\032\071\202\072\014");
sb.append("\074\021\075\141\076\053\077\055\100\161\101\006\102");
@@ -418,7 +418,7 @@ public class EncodedActionTable1 {
sb.append("\ufe5d\156\ufe5d\157\ufe5d\160\ufe5d\161\ufe5d\162\ufe5d\163\ufe5d");
sb.append("\164\ufe5d\165\ufe5d\166\ufe5d\167\ufe5d\170\ufe5d\171\ufe5d\172");
sb.append("\ufe5d\173\ufe5d\176\ufe5d\211\u0113\212\ufe5d\225\ufe3e\226\ufe5d");
- sb.append("\227\ufe5d\237\ufe5d\242\ufe5d\001\002\000\004\146\u0481\001");
+ sb.append("\227\ufe5d\237\ufe5d\242\ufe5d\001\002\000\004\146\u047f\001");
sb.append("\002\000\006\106\u0112\211\u0113\001\002\000\156\004\174");
sb.append("\006\127\007\011\010\214\011\063\012\072\015\160\016");
sb.append("\156\032\123\043\217\060\177\061\032\071\202\072\014");
@@ -437,7 +437,7 @@ public class EncodedActionTable1 {
sb.append("\177\062\200\204\201\030\202\162\203\042\204\153\205");
sb.append("\110\206\164\207\106\210\040\211\061\213\114\217\215");
sb.append("\225\220\230\120\231\134\232\070\233\143\001\002\000");
- sb.append("\004\010\u047c\001\002\000\156\004\174\006\127\007\011");
+ sb.append("\004\010\u047a\001\002\000\156\004\174\006\127\007\011");
sb.append("\010\214\011\063\012\072\015\160\016\156\032\123\043");
sb.append("\217\060\177\061\032\071\202\072\014\074\021\075\141");
sb.append("\076\053\077\055\100\161\101\006\102\037\111\216\112");
@@ -484,10 +484,10 @@ public class EncodedActionTable1 {
sb.append("\uff73\220\uff73\221\uff73\225\uff73\230\uff73\231\uff73\232\uff73");
sb.append("\233\uff73\235\uff73\001\002\000\030\010\314\012\072\063");
sb.append("\330\072\014\111\320\114\305\116\065\211\306\217\311");
- sb.append("\225\317\230\120\001\002\000\004\225\u046e\001\002\000");
- sb.append("\012\010\314\106\u0466\114\u0342\116\065\001\002\000\006");
- sb.append("\177\u0464\200\u0465\001\002\000\010\012\ufd7f\106\u0126\230");
- sb.append("\ufd7f\001\002\000\004\225\u0446\001\002\000\260\002\uffa8");
+ sb.append("\225\317\230\120\001\002\000\004\225\u046c\001\002\000");
+ sb.append("\012\010\314\106\u0464\114\u0341\116\065\001\002\000\006");
+ sb.append("\177\u0462\200\u0463\001\002\000\010\012\ufd7f\106\u0126\230");
+ sb.append("\ufd7f\001\002\000\004\225\u0444\001\002\000\260\002\uffa8");
sb.append("\003\uffa8\004\uffa8\005\uffa8\006\uffa8\007\uffa8\010\uffa8\011");
sb.append("\uffa8\012\uffa8\014\uffa8\015\uffa8\016\uffa8\017\uffa8\020\uffa8");
sb.append("\021\uffa8\023\uffa8\025\uffa8\027\uffa8\032\uffa8\034\uffa8\040");
@@ -577,8 +577,8 @@ public class EncodedActionTable1 {
sb.append("\161\ufd8b\162\ufd8b\163\ufd8b\164\ufd8b\165\ufd8b\166\ufd8b\167");
sb.append("\ufd8b\170\ufd8b\171\ufd8b\172\ufd8b\173\ufd8b\176\ufd8b\177\ufd8b");
sb.append("\200\ufd8b\211\ufd8b\212\ufd8b\225\ufd8b\226\ufd8b\227\ufd8b\237");
- sb.append("\ufd8b\240\ufd8b\242\ufd8b\243\ufd8b\001\002\000\004\010\u0409");
- sb.append("\001\002\000\006\124\u0404\146\u0405\001\002\000\120\031");
+ sb.append("\ufd8b\240\ufd8b\242\ufd8b\243\ufd8b\001\002\000\004\010\u0407");
+ sb.append("\001\002\000\006\124\u0402\146\u0403\001\002\000\120\031");
sb.append("\ufda3\033\ufda3\070\ufda3\106\u0112\107\ufda3\124\ufda3\125\ufda3");
sb.append("\126\ufda3\127\ufda3\145\ufda3\146\ufda3\147\ufda3\150\ufda3\151");
sb.append("\ufda3\152\ufda3\153\ufda3\154\ufda3\155\ufda3\156\ufda3\157\ufda3");
@@ -606,7 +606,7 @@ public class EncodedActionTable1 {
sb.append("\uff67\203\uff67\204\uff67\205\uff67\206\uff67\207\uff67\210\uff67");
sb.append("\211\uff67\213\uff67\214\uff67\215\uff67\216\uff67\217\uff67\220");
sb.append("\uff67\221\uff67\225\uff67\230\uff67\231\uff67\232\uff67\233\uff67");
- sb.append("\235\uff67\001\002\000\006\015\u0402\234\u0401\001\002\000");
+ sb.append("\235\uff67\001\002\000\006\015\u0400\234\u03ff\001\002\000");
sb.append("\236\003\142\004\174\005\211\006\127\007\011\010\036");
sb.append("\011\063\012\072\014\113\015\160\016\156\017\150\020");
sb.append("\144\021\051\023\035\025\121\027\210\032\123\034\157");
@@ -628,13 +628,13 @@ public class EncodedActionTable1 {
sb.append("\ufd8c\163\ufd8c\164\ufd8c\165\ufd8c\166\ufd8c\167\ufd8c\170\ufd8c");
sb.append("\171\ufd8c\172\ufd8c\173\ufd8c\176\ufd8c\177\ufd8c\200\ufd8c\211");
sb.append("\ufd8c\212\ufd8c\225\ufd8c\226\ufd8c\227\ufd8c\237\ufd8c\240\ufd8c");
- sb.append("\242\ufd8c\243\ufd8c\001\002\000\004\010\u03e4\001\002\000");
+ sb.append("\242\ufd8c\243\ufd8c\001\002\000\004\010\u03e3\001\002\000");
sb.append("\160\004\174\006\127\007\011\010\214\011\063\012\072");
sb.append("\015\160\016\156\032\123\043\217\060\177\061\032\071");
sb.append("\202\072\014\074\021\075\141\076\053\077\055\100\161");
sb.append("\101\006\102\037\111\216\112\155\113\043\114\077\116");
sb.append("\065\117\031\120\104\121\057\122\152\123\126\130\074");
- sb.append("\146\u03e1\167\124\170\103\174\176\175\016\177\062\200");
+ sb.append("\146\u03e0\167\124\170\103\174\176\175\016\177\062\200");
sb.append("\204\201\030\202\162\203\042\204\153\205\110\206\164");
sb.append("\207\106\210\040\211\061\213\114\217\215\225\220\230");
sb.append("\120\231\134\232\070\233\143\001\002\000\156\004\174");
@@ -677,7 +677,7 @@ public class EncodedActionTable1 {
sb.append("\174\176\175\016\177\062\200\204\201\030\202\162\203");
sb.append("\042\204\153\205\110\206\164\207\106\210\040\211\061");
sb.append("\213\114\217\215\225\220\230\120\231\134\232\070\233");
- sb.append("\143\001\002\000\004\225\u03d7\001\002\000\114\031\ufe20");
+ sb.append("\143\001\002\000\004\225\u03d6\001\002\000\114\031\ufe20");
sb.append("\033\ufe20\070\ufe20\107\ufe20\124\ufe20\125\ufe20\126\ufe20\127");
sb.append("\ufe20\145\ufe20\146\ufe20\147\ufe20\150\ufe20\151\ufe20\152\ufe20");
sb.append("\153\ufe20\154\ufe20\155\ufe20\156\ufe20\157\ufe20\160\ufe20\161");
@@ -690,7 +690,7 @@ public class EncodedActionTable1 {
sb.append("\ufe28\161\ufe28\162\ufe28\163\ufe28\164\ufe28\165\ufe28\166\ufe28");
sb.append("\167\ufe28\170\ufe28\171\ufe28\172\ufe28\173\ufe28\176\ufe28\211");
sb.append("\u0113\212\ufe28\225\ufe3f\226\ufe28\227\ufe28\237\ufe28\242\ufe28");
- sb.append("\001\002\000\004\225\u03bc\001\002\000\006\106\u0112\211");
+ sb.append("\001\002\000\004\225\u03bb\001\002\000\006\106\u0112\211");
sb.append("\u0113\001\002\000\114\031\ufe27\033\ufe27\070\ufe27\107\ufe27");
sb.append("\124\ufe27\125\ufe27\126\ufe27\127\ufe27\145\ufe27\146\ufe27\147");
sb.append("\ufe27\150\ufe27\151\ufe27\152\ufe27\153\ufe27\154\ufe27\155\ufe27");
@@ -741,17 +741,17 @@ public class EncodedActionTable1 {
sb.append("\047\046\060\177\061\032\071\202\072\014\074\021\075");
sb.append("\141\076\053\077\055\100\161\101\006\102\037\111\216");
sb.append("\112\155\113\043\114\077\116\065\117\031\120\104\121");
- sb.append("\057\122\152\123\126\130\074\146\u03ae\167\124\170\103");
+ sb.append("\057\122\152\123\126\130\074\146\u03ad\167\124\170\103");
sb.append("\174\176\175\016\177\062\200\204\201\030\202\162\203");
sb.append("\042\204\153\205\110\206\164\207\106\210\040\211\061");
- sb.append("\213\114\217\215\225\u03b2\230\120\231\134\232\070\233");
+ sb.append("\213\114\217\215\225\u03b1\230\120\231\134\232\070\233");
sb.append("\143\001\002\000\114\031\ufdc5\033\ufdc5\070\ufdc5\107\ufdc5");
sb.append("\124\ufdc5\125\ufdc5\126\ufdc5\127\ufdc5\145\ufdc5\146\ufdc5\147");
sb.append("\ufdc5\150\ufdc5\151\ufdc5\152\ufdc5\153\ufdc5\154\ufdc5\155\ufdc5");
sb.append("\156\ufdc5\157\ufdc5\160\ufdc5\161\ufdc5\162\ufdc5\163\ufdc5\164");
sb.append("\ufdc5\165\ufdc5\166\ufdc5\167\ufdc5\170\ufdc5\171\ufdc5\172\ufdc5");
sb.append("\173\ufdc5\176\ufdc5\212\ufdc5\226\ufdc5\227\ufdc5\237\ufdc5\242");
- sb.append("\ufdc5\001\002\000\004\110\u03aa\001\002\000\114\031\ufdc6");
+ sb.append("\ufdc5\001\002\000\004\110\u03a9\001\002\000\114\031\ufdc6");
sb.append("\033\ufdc6\070\ufdc6\107\ufdc6\124\ufdc6\125\ufdc6\126\ufdc6\127");
sb.append("\ufdc6\145\ufdc6\146\ufdc6\147\ufdc6\150\ufdc6\151\ufdc6\152\ufdc6");
sb.append("\153\ufdc6\154\ufdc6\155\ufdc6\156\ufdc6\157\ufdc6\160\ufdc6\161");
@@ -763,7 +763,7 @@ public class EncodedActionTable1 {
sb.append("\150\ufe2f\151\ufe2f\152\ufe2f\153\ufe2f\154\ufe2f\155\ufe2f\156");
sb.append("\ufe2f\157\ufe2f\160\ufe2f\161\ufe2f\162\ufe2f\163\ufe2f\164\ufe2f");
sb.append("\165\ufe2f\166\ufe2f\167\ufe2f\170\ufe2f\171\ufe2f\172\ufe2f\173");
- sb.append("\ufe2f\176\ufe2f\212\ufe2f\225\u03a5\226\ufe2f\227\ufe2f\237\ufe2f");
+ sb.append("\ufe2f\176\ufe2f\212\ufe2f\225\u03a4\226\ufe2f\227\ufe2f\237\ufe2f");
sb.append("\242\ufe2f\001\002\000\126\031\ufde0\033\ufde0\070\ufde0\106");
sb.append("\ufffc\107\ufde0\110\ufe3c\114\322\124\ufde0\125\ufde0\126\ufde0");
sb.append("\127\ufde0\145\ufde0\146\ufde0\147\ufde0\150\ufde0\151\ufde0\152");
@@ -779,7 +779,7 @@ public class EncodedActionTable1 {
sb.append("\130\074\167\124\170\103\174\176\175\016\177\062\200");
sb.append("\204\201\030\202\162\203\042\204\153\205\110\206\164");
sb.append("\207\106\210\040\211\061\213\114\217\215\225\220\230");
- sb.append("\120\231\134\232\070\233\143\001\002\000\004\225\u0384");
+ sb.append("\120\231\134\232\070\233\143\001\002\000\004\225\u0383");
sb.append("\001\002\000\114\031\ufdc2\033\ufdc2\070\ufdc2\107\ufdc2\124");
sb.append("\ufdc2\125\ufdc2\126\ufdc2\127\ufdc2\145\ufdc2\146\ufdc2\147\ufdc2");
sb.append("\150\ufdc2\151\ufdc2\152\ufdc2\153\ufdc2\154\ufdc2\155\ufdc2\156");
@@ -800,7 +800,7 @@ public class EncodedActionTable1 {
sb.append("\uffa9\203\uffa9\204\uffa9\205\uffa9\206\uffa9\207\uffa9\210\uffa9");
sb.append("\211\uffa9\213\uffa9\217\uffa9\220\uffa9\221\uffa9\225\uffa9\230");
sb.append("\uffa9\231\uffa9\232\uffa9\233\uffa9\235\uffa9\001\002\000\004");
- sb.append("\225\u0381\001\002\000\162\004\174\006\127\007\011\010");
+ sb.append("\225\u0380\001\002\000\162\004\174\006\127\007\011\010");
sb.append("\214\011\063\012\072\015\160\016\156\032\226\043\217");
sb.append("\046\013\047\046\060\177\061\032\071\202\072\014\074");
sb.append("\021\075\141\076\053\077\055\100\161\101\006\102\037");
@@ -840,7 +840,7 @@ public class EncodedActionTable1 {
sb.append("\uffab\200\uffab\201\uffab\202\uffab\203\uffab\204\uffab\205\uffab");
sb.append("\206\uffab\207\uffab\210\uffab\211\uffab\213\uffab\217\uffab\220");
sb.append("\uffab\221\uffab\225\uffab\230\uffab\231\uffab\232\uffab\233\uffab");
- sb.append("\235\uffab\001\002\000\004\225\u0369\001\002\000\004\225");
+ sb.append("\235\uffab\001\002\000\004\225\u0368\001\002\000\004\225");
sb.append("\212\001\002\000\156\004\174\006\127\007\011\010\214");
sb.append("\011\063\012\072\015\160\016\156\032\123\043\217\060");
sb.append("\177\061\032\071\202\072\014\074\021\075\141\076\053");
@@ -854,15 +854,15 @@ public class EncodedActionTable1 {
sb.append("\261\151\237\152\250\153\260\154\265\155\251\156\232");
sb.append("\157\247\160\264\161\263\162\245\163\243\164\262\165");
sb.append("\256\166\252\167\267\170\244\171\255\172\253\173\234");
- sb.append("\176\241\226\u034f\237\240\242\233\001\002\000\126\031");
+ sb.append("\176\241\226\u034e\237\240\242\233\001\002\000\126\031");
sb.append("\uffff\033\uffff\070\uffff\106\u0112\107\uffff\110\uffff\114\uffff");
sb.append("\124\uffff\125\uffff\126\uffff\127\uffff\145\uffff\146\uffff\147");
sb.append("\uffff\150\uffff\151\uffff\152\uffff\153\uffff\154\uffff\155\uffff");
sb.append("\156\uffff\157\uffff\160\uffff\161\uffff\162\uffff\163\uffff\164");
sb.append("\uffff\165\uffff\166\uffff\167\uffff\170\uffff\171\uffff\172\uffff");
sb.append("\173\uffff\176\uffff\211\u0113\212\uffff\225\uffff\226\uffff\227");
- sb.append("\uffff\237\uffff\242\uffff\001\002\000\006\043\u0344\110\ufe3d");
- sb.append("\001\002\000\004\114\u0342\001\002\000\006\153\u026e\225");
+ sb.append("\uffff\237\uffff\242\uffff\001\002\000\006\043\u0343\110\ufe3d");
+ sb.append("\001\002\000\004\114\u0341\001\002\000\006\153\u026e\225");
sb.append("\uff51\001\002\000\156\004\174\006\127\007\011\010\214");
sb.append("\011\063\012\072\015\160\016\156\032\226\043\217\060");
sb.append("\177\061\032\071\202\072\014\074\021\075\141\076\053");
@@ -883,12 +883,12 @@ public class EncodedActionTable1 {
sb.append("\153\ufdc1\154\ufdc1\155\ufdc1\156\ufdc1\157\ufdc1\160\ufdc1\161");
sb.append("\ufdc1\162\ufdc1\163\ufdc1\164\ufdc1\165\ufdc1\166\ufdc1\167\ufdc1");
sb.append("\170\ufdc1\171\ufdc1\172\ufdc1\173\ufdc1\176\ufdc1\177\ufdbf\200");
- sb.append("\ufdbf\226\u032d\237\ufdc1\240\347\242\ufdc1\243\361\001\002");
- sb.append("\000\004\226\u032c\001\002\000\076\031\ufea4\125\ufea4\126");
+ sb.append("\ufdbf\226\u032c\237\ufdc1\240\347\242\ufdc1\243\361\001\002");
+ sb.append("\000\004\226\u032b\001\002\000\076\031\ufea4\125\ufea4\126");
sb.append("\ufea4\127\ufea4\145\ufea4\147\ufea4\150\ufea4\151\ufea4\152\ufea4");
sb.append("\153\ufea4\154\ufea4\155\ufea4\156\ufea4\157\ufea4\160\ufea4\161");
sb.append("\ufea4\162\ufea4\163\ufea4\164\ufea4\165\ufea4\166\ufea4\167\ufea4");
- sb.append("\170\ufea4\171\ufea4\172\ufea4\173\ufea4\176\ufea4\226\u032b\237");
+ sb.append("\170\ufea4\171\ufea4\172\ufea4\173\ufea4\176\ufea4\226\u032a\237");
sb.append("\ufea4\242\ufea4\001\002\000\030\010\314\012\072\063\330");
sb.append("\072\014\111\320\114\305\116\065\211\306\217\311\225");
sb.append("\317\230\120\001\002\000\156\004\174\006\127\007\011");
@@ -991,7 +991,7 @@ public class EncodedActionTable1 {
sb.append("\120\104\121\057\122\152\123\126\130\074\167\124\170");
sb.append("\103\174\176\175\016\177\062\200\204\201\030\202\162");
sb.append("\203\042\204\153\205\110\206\164\207\106\210\040\211");
- sb.append("\061\213\114\217\215\225\220\227\u031c\230\120\231\134");
+ sb.append("\061\213\114\217\215\225\220\227\u031b\230\120\231\134");
sb.append("\232\070\233\143\001\002\000\156\004\174\006\127\007");
sb.append("\011\010\214\011\063\012\072\015\160\016\156\032\123");
sb.append("\043\217\060\177\061\032\071\202\072\014\074\021\075");
@@ -1231,14 +1231,14 @@ public class EncodedActionTable1 {
sb.append("\160\ufd98\161\ufd98\162\ufd98\163\ufd98\164\ufd98\165\ufd98\166");
sb.append("\ufd98\167\ufd98\170\ufd98\171\ufd98\172\ufd98\173\ufd98\176\ufd98");
sb.append("\212\ufd98\225\ufd98\226\ufd98\227\ufd98\237\ufd98\242\ufd98\001");
- sb.append("\002\000\004\110\u030d\001\002\000\006\106\u0112\211\u0113");
+ sb.append("\002\000\004\110\u030c\001\002\000\006\106\u0112\211\u0113");
sb.append("\001\002\000\006\010\314\116\065\001\002\000\164\004");
sb.append("\174\006\127\007\011\010\214\011\063\012\072\015\160");
- sb.append("\016\156\032\123\043\217\060\177\061\032\071\u02fa\072");
+ sb.append("\016\156\032\123\043\217\060\177\061\032\071\u02f9\072");
sb.append("\014\074\021\075\141\076\053\077\055\100\161\101\006");
sb.append("\102\037\111\216\112\155\113\043\114\077\116\065\117");
sb.append("\031\120\104\121\057\122\152\123\126\124\ufd7a\130\074");
- sb.append("\153\u02f4\167\124\170\103\174\176\175\016\177\062\200");
+ sb.append("\153\u02f3\167\124\170\103\174\176\175\016\177\062\200");
sb.append("\204\201\030\202\162\203\042\204\153\205\110\206\164");
sb.append("\207\106\210\040\211\061\212\ufd7a\213\114\217\215\225");
sb.append("\220\230\120\231\134\232\070\233\143\001\002\000\126");
@@ -1249,7 +1249,7 @@ public class EncodedActionTable1 {
sb.append("\164\ufd99\165\ufd99\166\ufd99\167\ufd99\170\ufd99\171\ufd99\172");
sb.append("\ufd99\173\ufd99\176\ufd99\211\u0113\212\ufd99\225\ufd99\226\ufd99");
sb.append("\227\ufd99\237\ufd99\242\ufd99\001\002\000\120\031\ufe36\033");
- sb.append("\ufe36\070\ufe36\107\ufe36\110\u02f2\124\ufe36\125\ufe36\126\ufe36");
+ sb.append("\ufe36\070\ufe36\107\ufe36\110\u02f1\124\ufe36\125\ufe36\126\ufe36");
sb.append("\127\ufe36\145\ufe36\146\ufe36\147\ufe36\150\ufe36\151\ufe36\152");
sb.append("\ufe36\153\ufe36\154\ufe36\155\ufe36\156\ufe36\157\ufe36\160\ufe36");
sb.append("\161\ufe36\162\ufe36\163\ufe36\164\ufe36\165\ufe36\166\ufe36\167");
@@ -1275,7 +1275,7 @@ public class EncodedActionTable1 {
sb.append("\162\uffff\163\uffff\164\uffff\165\uffff\166\uffff\167\uffff\170");
sb.append("\uffff\171\uffff\172\uffff\173\uffff\176\uffff\211\uffff\212\uffff");
sb.append("\225\uffff\226\uffff\227\uffff\237\uffff\241\uffff\242\uffff\001");
- sb.append("\002\000\120\031\ufe33\033\ufe33\067\u02ec\070\ufe33\107\ufe33");
+ sb.append("\002\000\120\031\ufe33\033\ufe33\067\u02eb\070\ufe33\107\ufe33");
sb.append("\124\ufe33\125\ufe33\126\ufe33\127\ufe33\145\ufe33\146\ufe33\147");
sb.append("\ufe33\150\ufe33\151\ufe33\152\ufe33\153\ufe33\154\ufe33\155\ufe33");
sb.append("\156\ufe33\157\ufe33\160\ufe33\161\ufe33\162\ufe33\163\ufe33\164");
@@ -1316,7 +1316,7 @@ public class EncodedActionTable1 {
sb.append("\ufea4\145\ufea4\147\ufea4\150\ufea4\151\ufea4\152\ufea4\153\ufea4");
sb.append("\154\ufea4\155\ufea4\156\ufea4\157\ufea4\160\ufea4\161\ufea4\162");
sb.append("\ufea4\163\ufea4\164\ufea4\165\ufea4\166\ufea4\167\ufea4\170\ufea4");
- sb.append("\171\ufea4\172\ufea4\173\ufea4\176\ufea4\226\u02ea\237\ufea4\242");
+ sb.append("\171\ufea4\172\ufea4\173\ufea4\176\ufea4\226\u02e9\237\ufea4\242");
sb.append("\ufea4\001\002\000\030\010\314\012\072\063\330\072\014");
sb.append("\111\320\114\305\116\065\211\306\217\311\225\317\230");
sb.append("\120\001\002\000\012\065\ufe2c\066\ufe2c\106\ufe2c\225\333");
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 ace5990..76d0278 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,186 +28,6 @@ public class EncodedActionTable10 {
}
protected EncodedActionTable10() {
sb = new StringBuilder();
- sb.append("\001");
- sb.append("\002");
- sb.append("\000");
- sb.append("\240");
- sb.append("\003");
- sb.append("\142");
- sb.append("\004");
- sb.append("\174");
- sb.append("\005");
- sb.append("\211");
- sb.append("\006");
- sb.append("\127");
- sb.append("\007");
- sb.append("\011");
- sb.append("\010");
- sb.append("\036");
- sb.append("\011");
- sb.append("\063");
- sb.append("\012");
- sb.append("\072");
- sb.append("\014");
- sb.append("\113");
- sb.append("\015");
- sb.append("\160");
- sb.append("\016");
- sb.append("\156");
- sb.append("\017");
- sb.append("\150");
- sb.append("\020");
- sb.append("\144");
- sb.append("\021");
- sb.append("\051");
- sb.append("\023");
- sb.append("\035");
- sb.append("\025");
- sb.append("\121");
- sb.append("\027");
- sb.append("\210");
- sb.append("\032");
- sb.append("\123");
- sb.append("\034");
- sb.append("\157");
- sb.append("\040");
- sb.append("\066");
- sb.append("\041");
- sb.append("\147");
- sb.append("\042");
- sb.append("\105");
- sb.append("\043");
- sb.append("\217");
- sb.append("\045");
- sb.append("\167");
- sb.append("\046");
- sb.append("\013");
- sb.append("\047");
- sb.append("\046");
- sb.append("\050");
- sb.append("\044");
- sb.append("\052");
- sb.append("\206");
- sb.append("\054");
- sb.append("\u0283");
- sb.append("\055");
- sb.append("\012");
- sb.append("\057");
- sb.append("\115");
- sb.append("\060");
- sb.append("\177");
- sb.append("\061");
- sb.append("\032");
- sb.append("\071");
- sb.append("\202");
- sb.append("\072");
- sb.append("\014");
- sb.append("\074");
- sb.append("\021");
- sb.append("\075");
- sb.append("\141");
- sb.append("\076");
- sb.append("\053");
- sb.append("\077");
- sb.append("\055");
- sb.append("\100");
- sb.append("\161");
- sb.append("\101");
- sb.append("\006");
- sb.append("\102");
- sb.append("\037");
- sb.append("\106");
- sb.append("\075");
- sb.append("\111");
- sb.append("\216");
- sb.append("\112");
- sb.append("\155");
- sb.append("\113");
- sb.append("\043");
- sb.append("\114");
- sb.append("\077");
- sb.append("\115");
- sb.append("\025");
- sb.append("\116");
- sb.append("\065");
- sb.append("\117");
- sb.append("\031");
- sb.append("\120");
- sb.append("\104");
- sb.append("\121");
- sb.append("\057");
- sb.append("\122");
- sb.append("\152");
- sb.append("\123");
- sb.append("\126");
- sb.append("\130");
- sb.append("\074");
- sb.append("\146");
- sb.append("\010");
- sb.append("\167");
- sb.append("\124");
- sb.append("\170");
- sb.append("\103");
- sb.append("\174");
- sb.append("\176");
- sb.append("\175");
- sb.append("\016");
- sb.append("\177");
- sb.append("\062");
- sb.append("\200");
- sb.append("\204");
- sb.append("\201");
- sb.append("\030");
- sb.append("\202");
- sb.append("\162");
- sb.append("\203");
- sb.append("\042");
- sb.append("\204");
- sb.append("\153");
- sb.append("\205");
- sb.append("\110");
- sb.append("\206");
- sb.append("\164");
- sb.append("\207");
- sb.append("\106");
- sb.append("\210");
- sb.append("\040");
- sb.append("\211");
- sb.append("\061");
- sb.append("\213");
- sb.append("\114");
- sb.append("\217");
- sb.append("\047");
- sb.append("\225");
- sb.append("\203");
- sb.append("\227");
- sb.append("\u0459");
- sb.append("\230");
- sb.append("\120");
- sb.append("\231");
- sb.append("\134");
- sb.append("\232");
- sb.append("\070");
- sb.append("\233");
- sb.append("\143");
- sb.append("\001");
- sb.append("\002");
- sb.append("\000");
- sb.append("\252");
- sb.append("\003");
- sb.append("\uff8b");
- sb.append("\004");
- sb.append("\uff8b");
- sb.append("\005");
- sb.append("\uff8b");
- sb.append("\006");
- sb.append("\uff8b");
- sb.append("\007");
- sb.append("\uff8b");
- sb.append("\010");
- sb.append("\uff8b");
- sb.append("\011");
- sb.append("\uff8b");
sb.append("\012");
sb.append("\uff8b");
sb.append("\014");
@@ -795,7 +615,7 @@ public class EncodedActionTable10 {
sb.append("\025");
sb.append("\121");
sb.append("\026");
- sb.append("\u045d");
+ sb.append("\u045b");
sb.append("\027");
sb.append("\210");
sb.append("\032");
@@ -935,7 +755,7 @@ public class EncodedActionTable10 {
sb.append("\000");
sb.append("\004");
sb.append("\146");
- sb.append("\u045e");
+ sb.append("\u045c");
sb.append("\001");
sb.append("\002");
sb.append("\000");
@@ -1145,7 +965,7 @@ public class EncodedActionTable10 {
sb.append("\016");
sb.append("\u0107");
sb.append("\071");
- sb.append("\u044e");
+ sb.append("\u044c");
sb.append("\072");
sb.append("\014");
sb.append("\111");
@@ -1155,9 +975,9 @@ public class EncodedActionTable10 {
sb.append("\116");
sb.append("\065");
sb.append("\153");
- sb.append("\u044d");
- sb.append("\211");
sb.append("\u044b");
+ sb.append("\211");
+ sb.append("\u0449");
sb.append("\217");
sb.append("\311");
sb.append("\225");
@@ -1169,7 +989,7 @@ public class EncodedActionTable10 {
sb.append("\000");
sb.append("\006");
sb.append("\070");
- sb.append("\u0456");
+ sb.append("\u0454");
sb.append("\226");
sb.append("\uff32");
sb.append("\001");
@@ -1177,7 +997,7 @@ public class EncodedActionTable10 {
sb.append("\000");
sb.append("\004");
sb.append("\226");
- sb.append("\u0462");
+ sb.append("\u0460");
sb.append("\001");
sb.append("\002");
sb.append("\000");
@@ -1331,7 +1151,7 @@ public class EncodedActionTable10 {
sb.append("\225");
sb.append("\203");
sb.append("\227");
- sb.append("\u0459");
+ sb.append("\u0457");
sb.append("\230");
sb.append("\120");
sb.append("\231");
@@ -1875,11 +1695,11 @@ public class EncodedActionTable10 {
sb.append("\000");
sb.append("\010");
sb.append("\106");
- sb.append("\u0468");
+ sb.append("\u0466");
sb.append("\114");
sb.append("\322");
sb.append("\146");
- sb.append("\u0469");
+ sb.append("\u0467");
sb.append("\001");
sb.append("\002");
sb.append("\000");
@@ -2333,7 +2153,7 @@ public class EncodedActionTable10 {
sb.append("\106");
sb.append("\075");
sb.append("\107");
- sb.append("\u046b");
+ sb.append("\u0469");
sb.append("\111");
sb.append("\116");
sb.append("\112");
@@ -2687,7 +2507,7 @@ public class EncodedActionTable10 {
sb.append("\106");
sb.append("\075");
sb.append("\107");
- sb.append("\u046d");
+ sb.append("\u046b");
sb.append("\111");
sb.append("\116");
sb.append("\112");
@@ -2989,7 +2809,7 @@ public class EncodedActionTable10 {
sb.append("\000");
sb.append("\006");
sb.append("\124");
- sb.append("\u0472");
+ sb.append("\u0470");
sb.append("\226");
sb.append("\ufdd7");
sb.append("\001");
@@ -3025,13 +2845,13 @@ public class EncodedActionTable10 {
sb.append("\000");
sb.append("\004");
sb.append("\226");
- sb.append("\u0474");
+ sb.append("\u0472");
sb.append("\001");
sb.append("\002");
sb.append("\000");
sb.append("\004");
sb.append("\146");
- sb.append("\u0475");
+ sb.append("\u0473");
sb.append("\001");
sb.append("\002");
sb.append("\000");
@@ -3677,7 +3497,7 @@ public class EncodedActionTable10 {
sb.append("\000");
sb.append("\004");
sb.append("\146");
- sb.append("\u047d");
+ sb.append("\u047b");
sb.append("\001");
sb.append("\002");
sb.append("\000");
@@ -4495,7 +4315,7 @@ public class EncodedActionTable10 {
sb.append("\106");
sb.append("\075");
sb.append("\107");
- sb.append("\u0484");
+ sb.append("\u0482");
sb.append("\111");
sb.append("\216");
sb.append("\112");
@@ -4528,5 +4348,185 @@ public class EncodedActionTable10 {
sb.append("\103");
sb.append("\174");
sb.append("\176");
+ sb.append("\175");
+ sb.append("\016");
+ sb.append("\177");
+ sb.append("\062");
+ sb.append("\200");
+ sb.append("\204");
+ sb.append("\201");
+ sb.append("\030");
+ sb.append("\202");
+ sb.append("\162");
+ sb.append("\203");
+ sb.append("\042");
+ sb.append("\204");
+ sb.append("\153");
+ sb.append("\205");
+ sb.append("\110");
+ sb.append("\206");
+ sb.append("\164");
+ sb.append("\207");
+ sb.append("\106");
+ sb.append("\210");
+ sb.append("\040");
+ sb.append("\211");
+ sb.append("\061");
+ sb.append("\213");
+ sb.append("\114");
+ sb.append("\217");
+ sb.append("\047");
+ sb.append("\220");
+ sb.append("\073");
+ sb.append("\221");
+ sb.append("\020");
+ sb.append("\225");
+ sb.append("\203");
+ sb.append("\230");
+ sb.append("\120");
+ sb.append("\231");
+ sb.append("\134");
+ sb.append("\232");
+ sb.append("\070");
+ sb.append("\233");
+ sb.append("\143");
+ sb.append("\235");
+ sb.append("\146");
+ sb.append("\001");
+ sb.append("\002");
+ sb.append("\000");
+ sb.append("\304");
+ sb.append("\002");
+ sb.append("\uff85");
+ sb.append("\003");
+ sb.append("\uff85");
+ sb.append("\004");
+ sb.append("\uff85");
+ sb.append("\005");
+ sb.append("\uff85");
+ sb.append("\006");
+ sb.append("\uff85");
+ sb.append("\007");
+ sb.append("\uff85");
+ sb.append("\010");
+ sb.append("\uff85");
+ sb.append("\011");
+ sb.append("\uff85");
+ sb.append("\012");
+ sb.append("\uff85");
+ sb.append("\014");
+ sb.append("\uff85");
+ sb.append("\015");
+ sb.append("\uff85");
+ sb.append("\016");
+ sb.append("\uff85");
+ sb.append("\017");
+ sb.append("\uff85");
+ sb.append("\020");
+ sb.append("\uff85");
+ sb.append("\021");
+ sb.append("\uff85");
+ sb.append("\022");
+ sb.append("\uff85");
+ sb.append("\023");
+ sb.append("\uff85");
+ sb.append("\024");
+ sb.append("\uff85");
+ sb.append("\025");
+ sb.append("\uff85");
+ sb.append("\026");
+ sb.append("\uff85");
+ sb.append("\027");
+ sb.append("\uff85");
+ sb.append("\030");
+ sb.append("\uff85");
+ sb.append("\032");
+ sb.append("\uff85");
+ sb.append("\034");
+ sb.append("\uff85");
+ sb.append("\035");
+ sb.append("\uff85");
+ sb.append("\036");
+ sb.append("\uff85");
+ sb.append("\037");
+ sb.append("\uff85");
+ sb.append("\040");
+ sb.append("\uff85");
+ sb.append("\041");
+ sb.append("\uff85");
+ sb.append("\042");
+ sb.append("\uff85");
+ sb.append("\043");
+ sb.append("\uff85");
+ sb.append("\044");
+ sb.append("\uff85");
+ sb.append("\045");
+ sb.append("\uff85");
+ sb.append("\046");
+ sb.append("\uff85");
+ sb.append("\047");
+ sb.append("\uff85");
+ sb.append("\050");
+ sb.append("\uff85");
+ sb.append("\052");
+ sb.append("\uff85");
+ sb.append("\054");
+ sb.append("\uff85");
+ sb.append("\055");
+ sb.append("\uff85");
+ sb.append("\057");
+ sb.append("\uff85");
+ sb.append("\060");
+ sb.append("\uff85");
+ sb.append("\061");
+ sb.append("\uff85");
+ sb.append("\062");
+ sb.append("\uff85");
+ sb.append("\063");
+ sb.append("\uff85");
+ sb.append("\064");
+ sb.append("\uff85");
+ sb.append("\071");
+ sb.append("\uff85");
+ sb.append("\072");
+ sb.append("\uff85");
+ sb.append("\074");
+ sb.append("\uff85");
+ sb.append("\075");
+ sb.append("\uff85");
+ sb.append("\076");
+ sb.append("\uff85");
+ sb.append("\077");
+ sb.append("\uff85");
+ sb.append("\100");
+ sb.append("\uff85");
+ sb.append("\101");
+ sb.append("\uff85");
+ sb.append("\102");
+ sb.append("\uff85");
+ sb.append("\106");
+ sb.append("\uff85");
+ sb.append("\107");
+ sb.append("\uff85");
+ sb.append("\111");
+ sb.append("\uff85");
+ sb.append("\112");
+ sb.append("\uff85");
+ sb.append("\113");
+ sb.append("\uff85");
+ sb.append("\114");
+ sb.append("\uff85");
+ sb.append("\115");
+ sb.append("\uff85");
+ sb.append("\116");
+ sb.append("\uff85");
+ sb.append("\117");
+ sb.append("\uff85");
+ sb.append("\120");
+ sb.append("\uff85");
+ sb.append("\121");
+ sb.append("\uff85");
+ sb.append("\122");
+ sb.append("\uff85");
}
}
\ 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 289f11c..2c009ae 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,186 +28,6 @@ public class EncodedActionTable11 {
}
protected EncodedActionTable11() {
sb = new StringBuilder();
- sb.append("\175");
- sb.append("\016");
- sb.append("\177");
- sb.append("\062");
- sb.append("\200");
- sb.append("\204");
- sb.append("\201");
- sb.append("\030");
- sb.append("\202");
- sb.append("\162");
- sb.append("\203");
- sb.append("\042");
- sb.append("\204");
- sb.append("\153");
- sb.append("\205");
- sb.append("\110");
- sb.append("\206");
- sb.append("\164");
- sb.append("\207");
- sb.append("\106");
- sb.append("\210");
- sb.append("\040");
- sb.append("\211");
- sb.append("\061");
- sb.append("\213");
- sb.append("\114");
- sb.append("\217");
- sb.append("\047");
- sb.append("\220");
- sb.append("\073");
- sb.append("\221");
- sb.append("\020");
- sb.append("\225");
- sb.append("\203");
- sb.append("\230");
- sb.append("\120");
- sb.append("\231");
- sb.append("\134");
- sb.append("\232");
- sb.append("\070");
- sb.append("\233");
- sb.append("\143");
- sb.append("\235");
- sb.append("\146");
- sb.append("\001");
- sb.append("\002");
- sb.append("\000");
- sb.append("\304");
- sb.append("\002");
- sb.append("\uff85");
- sb.append("\003");
- sb.append("\uff85");
- sb.append("\004");
- sb.append("\uff85");
- sb.append("\005");
- sb.append("\uff85");
- sb.append("\006");
- sb.append("\uff85");
- sb.append("\007");
- sb.append("\uff85");
- sb.append("\010");
- sb.append("\uff85");
- sb.append("\011");
- sb.append("\uff85");
- sb.append("\012");
- sb.append("\uff85");
- sb.append("\014");
- sb.append("\uff85");
- sb.append("\015");
- sb.append("\uff85");
- sb.append("\016");
- sb.append("\uff85");
- sb.append("\017");
- sb.append("\uff85");
- sb.append("\020");
- sb.append("\uff85");
- sb.append("\021");
- sb.append("\uff85");
- sb.append("\022");
- sb.append("\uff85");
- sb.append("\023");
- sb.append("\uff85");
- sb.append("\024");
- sb.append("\uff85");
- sb.append("\025");
- sb.append("\uff85");
- sb.append("\026");
- sb.append("\uff85");
- sb.append("\027");
- sb.append("\uff85");
- sb.append("\030");
- sb.append("\uff85");
- sb.append("\032");
- sb.append("\uff85");
- sb.append("\034");
- sb.append("\uff85");
- sb.append("\035");
- sb.append("\uff85");
- sb.append("\036");
- sb.append("\uff85");
- sb.append("\037");
- sb.append("\uff85");
- sb.append("\040");
- sb.append("\uff85");
- sb.append("\041");
- sb.append("\uff85");
- sb.append("\042");
- sb.append("\uff85");
- sb.append("\043");
- sb.append("\uff85");
- sb.append("\044");
- sb.append("\uff85");
- sb.append("\045");
- sb.append("\uff85");
- sb.append("\046");
- sb.append("\uff85");
- sb.append("\047");
- sb.append("\uff85");
- sb.append("\050");
- sb.append("\uff85");
- sb.append("\052");
- sb.append("\uff85");
- sb.append("\054");
- sb.append("\uff85");
- sb.append("\055");
- sb.append("\uff85");
- sb.append("\057");
- sb.append("\uff85");
- sb.append("\060");
- sb.append("\uff85");
- sb.append("\061");
- sb.append("\uff85");
- sb.append("\062");
- sb.append("\uff85");
- sb.append("\063");
- sb.append("\uff85");
- sb.append("\064");
- sb.append("\uff85");
- sb.append("\071");
- sb.append("\uff85");
- sb.append("\072");
- sb.append("\uff85");
- sb.append("\074");
- sb.append("\uff85");
- sb.append("\075");
- sb.append("\uff85");
- sb.append("\076");
- sb.append("\uff85");
- sb.append("\077");
- sb.append("\uff85");
- sb.append("\100");
- sb.append("\uff85");
- sb.append("\101");
- sb.append("\uff85");
- sb.append("\102");
- sb.append("\uff85");
- sb.append("\106");
- sb.append("\uff85");
- sb.append("\107");
- sb.append("\uff85");
- sb.append("\111");
- sb.append("\uff85");
- sb.append("\112");
- sb.append("\uff85");
- sb.append("\113");
- sb.append("\uff85");
- sb.append("\114");
- sb.append("\uff85");
- sb.append("\115");
- sb.append("\uff85");
- sb.append("\116");
- sb.append("\uff85");
- sb.append("\117");
- sb.append("\uff85");
- sb.append("\120");
- sb.append("\uff85");
- sb.append("\121");
- sb.append("\uff85");
- sb.append("\122");
- sb.append("\uff85");
sb.append("\123");
sb.append("\uff85");
sb.append("\130");
@@ -687,13 +507,13 @@ public class EncodedActionTable11 {
sb.append("\012");
sb.append("\072");
sb.append("\015");
- sb.append("\u0428");
+ sb.append("\u0426");
sb.append("\104");
- sb.append("\u0427");
+ sb.append("\u0425");
sb.append("\105");
- sb.append("\u0426");
+ sb.append("\u0424");
sb.append("\232");
- sb.append("\u048b");
+ sb.append("\u0489");
sb.append("\001");
sb.append("\002");
sb.append("\000");
@@ -985,7 +805,7 @@ public class EncodedActionTable11 {
sb.append("\145");
sb.append("\242");
sb.append("\146");
- sb.append("\u048e");
+ sb.append("\u048c");
sb.append("\147");
sb.append("\235");
sb.append("\150");
@@ -1315,7 +1135,7 @@ public class EncodedActionTable11 {
sb.append("\000");
sb.append("\004");
sb.append("\212");
- sb.append("\u0491");
+ sb.append("\u048f");
sb.append("\001");
sb.append("\002");
sb.append("\000");
@@ -1339,7 +1159,7 @@ public class EncodedActionTable11 {
sb.append("\127");
sb.append("\ufd9a");
sb.append("\131");
- sb.append("\u0492");
+ sb.append("\u0490");
sb.append("\145");
sb.append("\ufd9a");
sb.append("\146");
@@ -1883,7 +1703,7 @@ public class EncodedActionTable11 {
sb.append("\176");
sb.append("\241");
sb.append("\226");
- sb.append("\u0497");
+ sb.append("\u0495");
sb.append("\237");
sb.append("\240");
sb.append("\242");
@@ -2479,7 +2299,7 @@ public class EncodedActionTable11 {
sb.append("\000");
sb.append("\004");
sb.append("\106");
- sb.append("\u04a0");
+ sb.append("\u049e");
sb.append("\001");
sb.append("\002");
sb.append("\000");
@@ -2521,7 +2341,7 @@ public class EncodedActionTable11 {
sb.append("\056");
sb.append("\u025f");
sb.append("\107");
- sb.append("\u04a2");
+ sb.append("\u04a0");
sb.append("\115");
sb.append("\u026b");
sb.append("\217");
@@ -3611,7 +3431,7 @@ public class EncodedActionTable11 {
sb.append("\000");
sb.append("\004");
sb.append("\226");
- sb.append("\u04ab");
+ sb.append("\u04a9");
sb.append("\001");
sb.append("\002");
sb.append("\000");
@@ -3903,7 +3723,7 @@ public class EncodedActionTable11 {
sb.append("\176");
sb.append("\241");
sb.append("\226");
- sb.append("\u04ae");
+ sb.append("\u04ac");
sb.append("\237");
sb.append("\240");
sb.append("\242");
@@ -4061,7 +3881,7 @@ public class EncodedActionTable11 {
sb.append("\225");
sb.append("\203");
sb.append("\227");
- sb.append("\u04af");
+ sb.append("\u04ad");
sb.append("\230");
sb.append("\120");
sb.append("\231");
@@ -4528,5 +4348,185 @@ public class EncodedActionTable11 {
sb.append("\uff1b");
sb.append("\061");
sb.append("\uff1b");
+ sb.append("\062");
+ sb.append("\uff1b");
+ sb.append("\063");
+ sb.append("\uff1b");
+ sb.append("\064");
+ sb.append("\uff1b");
+ sb.append("\071");
+ sb.append("\uff1b");
+ sb.append("\072");
+ sb.append("\uff1b");
+ sb.append("\074");
+ sb.append("\uff1b");
+ sb.append("\075");
+ sb.append("\uff1b");
+ sb.append("\076");
+ sb.append("\uff1b");
+ sb.append("\077");
+ sb.append("\uff1b");
+ sb.append("\100");
+ sb.append("\uff1b");
+ sb.append("\101");
+ sb.append("\uff1b");
+ sb.append("\102");
+ sb.append("\uff1b");
+ sb.append("\106");
+ sb.append("\uff1b");
+ sb.append("\107");
+ sb.append("\uff1b");
+ sb.append("\111");
+ sb.append("\uff1b");
+ sb.append("\112");
+ sb.append("\uff1b");
+ sb.append("\113");
+ sb.append("\uff1b");
+ sb.append("\114");
+ sb.append("\uff1b");
+ sb.append("\115");
+ sb.append("\uff1b");
+ sb.append("\116");
+ sb.append("\uff1b");
+ sb.append("\117");
+ sb.append("\uff1b");
+ sb.append("\120");
+ sb.append("\uff1b");
+ sb.append("\121");
+ sb.append("\uff1b");
+ sb.append("\122");
+ sb.append("\uff1b");
+ sb.append("\123");
+ sb.append("\uff1b");
+ sb.append("\130");
+ sb.append("\uff1b");
+ sb.append("\146");
+ sb.append("\uff1b");
+ sb.append("\167");
+ sb.append("\uff1b");
+ sb.append("\170");
+ sb.append("\uff1b");
+ sb.append("\174");
+ sb.append("\uff1b");
+ sb.append("\175");
+ sb.append("\uff1b");
+ sb.append("\177");
+ sb.append("\uff1b");
+ sb.append("\200");
+ sb.append("\uff1b");
+ sb.append("\201");
+ sb.append("\uff1b");
+ sb.append("\202");
+ sb.append("\uff1b");
+ sb.append("\203");
+ sb.append("\uff1b");
+ sb.append("\204");
+ sb.append("\uff1b");
+ sb.append("\205");
+ sb.append("\uff1b");
+ sb.append("\206");
+ sb.append("\uff1b");
+ sb.append("\207");
+ sb.append("\uff1b");
+ sb.append("\210");
+ sb.append("\uff1b");
+ sb.append("\211");
+ sb.append("\uff1b");
+ sb.append("\213");
+ sb.append("\uff1b");
+ sb.append("\214");
+ sb.append("\uff1b");
+ sb.append("\215");
+ sb.append("\uff1b");
+ sb.append("\216");
+ sb.append("\uff1b");
+ sb.append("\217");
+ sb.append("\uff1b");
+ sb.append("\220");
+ sb.append("\uff1b");
+ sb.append("\221");
+ sb.append("\uff1b");
+ sb.append("\225");
+ sb.append("\uff1b");
+ sb.append("\230");
+ sb.append("\uff1b");
+ sb.append("\231");
+ sb.append("\uff1b");
+ sb.append("\232");
+ sb.append("\uff1b");
+ sb.append("\233");
+ sb.append("\uff1b");
+ sb.append("\235");
+ sb.append("\uff1b");
+ sb.append("\001");
+ sb.append("\002");
+ sb.append("\000");
+ sb.append("\252");
+ sb.append("\003");
+ sb.append("\142");
+ sb.append("\004");
+ sb.append("\174");
+ sb.append("\005");
+ sb.append("\211");
+ sb.append("\006");
+ sb.append("\127");
+ sb.append("\007");
+ sb.append("\011");
+ sb.append("\010");
+ sb.append("\036");
+ sb.append("\011");
+ sb.append("\063");
+ sb.append("\012");
+ sb.append("\072");
+ sb.append("\014");
+ sb.append("\113");
+ sb.append("\015");
+ sb.append("\160");
+ sb.append("\016");
+ sb.append("\156");
+ sb.append("\017");
+ sb.append("\150");
+ sb.append("\020");
+ sb.append("\144");
+ sb.append("\021");
+ sb.append("\051");
+ sb.append("\022");
+ sb.append("\u04b1");
+ sb.append("\023");
+ sb.append("\035");
+ sb.append("\025");
+ sb.append("\121");
+ sb.append("\027");
+ sb.append("\210");
+ sb.append("\032");
+ sb.append("\123");
+ sb.append("\034");
+ sb.append("\157");
+ sb.append("\040");
+ sb.append("\066");
+ sb.append("\041");
+ sb.append("\147");
+ sb.append("\042");
+ sb.append("\105");
+ sb.append("\043");
+ sb.append("\130");
+ sb.append("\045");
+ sb.append("\167");
+ sb.append("\046");
+ sb.append("\013");
+ sb.append("\047");
+ sb.append("\046");
+ sb.append("\050");
+ sb.append("\044");
+ sb.append("\052");
+ sb.append("\206");
+ sb.append("\054");
+ sb.append("\u0283");
+ sb.append("\055");
+ sb.append("\012");
+ sb.append("\057");
+ sb.append("\115");
+ sb.append("\060");
+ sb.append("\177");
}
}
\ 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 e4a7ad8..55ae9da 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,186 +28,6 @@ public class EncodedActionTable12 {
}
protected EncodedActionTable12() {
sb = new StringBuilder();
- sb.append("\062");
- sb.append("\uff1b");
- sb.append("\063");
- sb.append("\uff1b");
- sb.append("\064");
- sb.append("\uff1b");
- sb.append("\071");
- sb.append("\uff1b");
- sb.append("\072");
- sb.append("\uff1b");
- sb.append("\074");
- sb.append("\uff1b");
- sb.append("\075");
- sb.append("\uff1b");
- sb.append("\076");
- sb.append("\uff1b");
- sb.append("\077");
- sb.append("\uff1b");
- sb.append("\100");
- sb.append("\uff1b");
- sb.append("\101");
- sb.append("\uff1b");
- sb.append("\102");
- sb.append("\uff1b");
- sb.append("\106");
- sb.append("\uff1b");
- sb.append("\107");
- sb.append("\uff1b");
- sb.append("\111");
- sb.append("\uff1b");
- sb.append("\112");
- sb.append("\uff1b");
- sb.append("\113");
- sb.append("\uff1b");
- sb.append("\114");
- sb.append("\uff1b");
- sb.append("\115");
- sb.append("\uff1b");
- sb.append("\116");
- sb.append("\uff1b");
- sb.append("\117");
- sb.append("\uff1b");
- sb.append("\120");
- sb.append("\uff1b");
- sb.append("\121");
- sb.append("\uff1b");
- sb.append("\122");
- sb.append("\uff1b");
- sb.append("\123");
- sb.append("\uff1b");
- sb.append("\130");
- sb.append("\uff1b");
- sb.append("\146");
- sb.append("\uff1b");
- sb.append("\167");
- sb.append("\uff1b");
- sb.append("\170");
- sb.append("\uff1b");
- sb.append("\174");
- sb.append("\uff1b");
- sb.append("\175");
- sb.append("\uff1b");
- sb.append("\177");
- sb.append("\uff1b");
- sb.append("\200");
- sb.append("\uff1b");
- sb.append("\201");
- sb.append("\uff1b");
- sb.append("\202");
- sb.append("\uff1b");
- sb.append("\203");
- sb.append("\uff1b");
- sb.append("\204");
- sb.append("\uff1b");
- sb.append("\205");
- sb.append("\uff1b");
- sb.append("\206");
- sb.append("\uff1b");
- sb.append("\207");
- sb.append("\uff1b");
- sb.append("\210");
- sb.append("\uff1b");
- sb.append("\211");
- sb.append("\uff1b");
- sb.append("\213");
- sb.append("\uff1b");
- sb.append("\214");
- sb.append("\uff1b");
- sb.append("\215");
- sb.append("\uff1b");
- sb.append("\216");
- sb.append("\uff1b");
- sb.append("\217");
- sb.append("\uff1b");
- sb.append("\220");
- sb.append("\uff1b");
- sb.append("\221");
- sb.append("\uff1b");
- sb.append("\225");
- sb.append("\uff1b");
- sb.append("\230");
- sb.append("\uff1b");
- sb.append("\231");
- sb.append("\uff1b");
- sb.append("\232");
- sb.append("\uff1b");
- sb.append("\233");
- sb.append("\uff1b");
- sb.append("\235");
- sb.append("\uff1b");
- sb.append("\001");
- sb.append("\002");
- sb.append("\000");
- sb.append("\252");
- sb.append("\003");
- sb.append("\142");
- sb.append("\004");
- sb.append("\174");
- sb.append("\005");
- sb.append("\211");
- sb.append("\006");
- sb.append("\127");
- sb.append("\007");
- sb.append("\011");
- sb.append("\010");
- sb.append("\036");
- sb.append("\011");
- sb.append("\063");
- sb.append("\012");
- sb.append("\072");
- sb.append("\014");
- sb.append("\113");
- sb.append("\015");
- sb.append("\160");
- sb.append("\016");
- sb.append("\156");
- sb.append("\017");
- sb.append("\150");
- sb.append("\020");
- sb.append("\144");
- sb.append("\021");
- sb.append("\051");
- sb.append("\022");
- sb.append("\u04b3");
- sb.append("\023");
- sb.append("\035");
- sb.append("\025");
- sb.append("\121");
- sb.append("\027");
- sb.append("\210");
- sb.append("\032");
- sb.append("\123");
- sb.append("\034");
- sb.append("\157");
- sb.append("\040");
- sb.append("\066");
- sb.append("\041");
- sb.append("\147");
- sb.append("\042");
- sb.append("\105");
- sb.append("\043");
- sb.append("\130");
- sb.append("\045");
- sb.append("\167");
- sb.append("\046");
- sb.append("\013");
- sb.append("\047");
- sb.append("\046");
- sb.append("\050");
- sb.append("\044");
- sb.append("\052");
- sb.append("\206");
- sb.append("\054");
- sb.append("\u0283");
- sb.append("\055");
- sb.append("\012");
- sb.append("\057");
- sb.append("\115");
- sb.append("\060");
- sb.append("\177");
sb.append("\061");
sb.append("\032");
sb.append("\063");
@@ -315,7 +135,7 @@ public class EncodedActionTable12 {
sb.append("\000");
sb.append("\004");
sb.append("\146");
- sb.append("\u04b4");
+ sb.append("\u04b2");
sb.append("\001");
sb.append("\002");
sb.append("\000");
@@ -1155,7 +975,7 @@ public class EncodedActionTable12 {
sb.append("\124");
sb.append("\ufef0");
sb.append("\131");
- sb.append("\u04c1");
+ sb.append("\u04bf");
sb.append("\146");
sb.append("\ufef0");
sb.append("\001");
@@ -1163,15 +983,15 @@ public class EncodedActionTable12 {
sb.append("\000");
sb.append("\006");
sb.append("\124");
- sb.append("\u04bc");
+ sb.append("\u04ba");
sb.append("\146");
- sb.append("\u04bd");
+ sb.append("\u04bb");
sb.append("\001");
sb.append("\002");
sb.append("\000");
sb.append("\004");
sb.append("\012");
- sb.append("\u04be");
+ sb.append("\u04bc");
sb.append("\001");
sb.append("\002");
sb.append("\000");
@@ -1377,7 +1197,7 @@ public class EncodedActionTable12 {
sb.append("\124");
sb.append("\ufef2");
sb.append("\131");
- sb.append("\u04bf");
+ sb.append("\u04bd");
sb.append("\146");
sb.append("\ufef2");
sb.append("\001");
@@ -1853,7 +1673,7 @@ public class EncodedActionTable12 {
sb.append("\106");
sb.append("\075");
sb.append("\107");
- sb.append("\u04c6");
+ sb.append("\u04c4");
sb.append("\111");
sb.append("\216");
sb.append("\112");
@@ -1935,21 +1755,21 @@ public class EncodedActionTable12 {
sb.append("\000");
sb.append("\006");
sb.append("\051");
- sb.append("\u04c7");
+ sb.append("\u04c5");
sb.append("\053");
- sb.append("\u04c8");
+ sb.append("\u04c6");
sb.append("\001");
sb.append("\002");
sb.append("\000");
sb.append("\004");
sb.append("\225");
- sb.append("\u04cc");
+ sb.append("\u04ca");
sb.append("\001");
sb.append("\002");
sb.append("\000");
sb.append("\004");
sb.append("\106");
- sb.append("\u04c9");
+ sb.append("\u04c7");
sb.append("\001");
sb.append("\002");
sb.append("\000");
@@ -2217,7 +2037,7 @@ public class EncodedActionTable12 {
sb.append("\106");
sb.append("\075");
sb.append("\107");
- sb.append("\u04cb");
+ sb.append("\u04c9");
sb.append("\111");
sb.append("\216");
sb.append("\112");
@@ -2517,7 +2337,7 @@ public class EncodedActionTable12 {
sb.append("\012");
sb.append("\uff5c");
sb.append("\151");
- sb.append("\u04d0");
+ sb.append("\u04ce");
sb.append("\001");
sb.append("\002");
sb.append("\000");
@@ -2551,7 +2371,7 @@ public class EncodedActionTable12 {
sb.append("\012");
sb.append("\uff5d");
sb.append("\151");
- sb.append("\u04d0");
+ sb.append("\u04ce");
sb.append("\001");
sb.append("\002");
sb.append("\000");
@@ -2573,13 +2393,13 @@ public class EncodedActionTable12 {
sb.append("\000");
sb.append("\004");
sb.append("\226");
- sb.append("\u04d6");
+ sb.append("\u04d4");
sb.append("\001");
sb.append("\002");
sb.append("\000");
sb.append("\004");
sb.append("\106");
- sb.append("\u04d7");
+ sb.append("\u04d5");
sb.append("\001");
sb.append("\002");
sb.append("\000");
@@ -2847,7 +2667,7 @@ public class EncodedActionTable12 {
sb.append("\106");
sb.append("\075");
sb.append("\107");
- sb.append("\u04d9");
+ sb.append("\u04d7");
sb.append("\111");
sb.append("\216");
sb.append("\112");
@@ -3001,7 +2821,7 @@ public class EncodedActionTable12 {
sb.append("\050");
sb.append("\uff64");
sb.append("\051");
- sb.append("\u04da");
+ sb.append("\u04d8");
sb.append("\052");
sb.append("\uff64");
sb.append("\053");
@@ -3131,7 +2951,7 @@ public class EncodedActionTable12 {
sb.append("\000");
sb.append("\004");
sb.append("\225");
- sb.append("\u04e4");
+ sb.append("\u04e2");
sb.append("\001");
sb.append("\002");
sb.append("\000");
@@ -3211,7 +3031,7 @@ public class EncodedActionTable12 {
sb.append("\052");
sb.append("\uff60");
sb.append("\053");
- sb.append("\u04e0");
+ sb.append("\u04de");
sb.append("\054");
sb.append("\uff60");
sb.append("\055");
@@ -3611,7 +3431,7 @@ public class EncodedActionTable12 {
sb.append("\050");
sb.append("\uff65");
sb.append("\051");
- sb.append("\u04da");
+ sb.append("\u04d8");
sb.append("\052");
sb.append("\uff65");
sb.append("\053");
@@ -4141,7 +3961,7 @@ public class EncodedActionTable12 {
sb.append("\000");
sb.append("\004");
sb.append("\106");
- sb.append("\u04e1");
+ sb.append("\u04df");
sb.append("\001");
sb.append("\002");
sb.append("\000");
@@ -4409,7 +4229,7 @@ public class EncodedActionTable12 {
sb.append("\106");
sb.append("\075");
sb.append("\107");
- sb.append("\u04e3");
+ sb.append("\u04e1");
sb.append("\111");
sb.append("\216");
sb.append("\112");
@@ -4528,5 +4348,185 @@ public class EncodedActionTable12 {
sb.append("\uff5f");
sb.append("\025");
sb.append("\uff5f");
+ sb.append("\026");
+ sb.append("\uff5f");
+ sb.append("\027");
+ sb.append("\uff5f");
+ sb.append("\030");
+ sb.append("\uff5f");
+ sb.append("\032");
+ sb.append("\uff5f");
+ sb.append("\034");
+ sb.append("\uff5f");
+ sb.append("\035");
+ sb.append("\uff5f");
+ sb.append("\036");
+ sb.append("\uff5f");
+ sb.append("\037");
+ sb.append("\uff5f");
+ sb.append("\040");
+ sb.append("\uff5f");
+ sb.append("\041");
+ sb.append("\uff5f");
+ sb.append("\042");
+ sb.append("\uff5f");
+ sb.append("\043");
+ sb.append("\uff5f");
+ sb.append("\044");
+ sb.append("\uff5f");
+ sb.append("\045");
+ sb.append("\uff5f");
+ sb.append("\046");
+ sb.append("\uff5f");
+ sb.append("\047");
+ sb.append("\uff5f");
+ sb.append("\050");
+ sb.append("\uff5f");
+ sb.append("\052");
+ sb.append("\uff5f");
+ sb.append("\054");
+ sb.append("\uff5f");
+ sb.append("\055");
+ sb.append("\uff5f");
+ sb.append("\057");
+ sb.append("\uff5f");
+ sb.append("\060");
+ sb.append("\uff5f");
+ sb.append("\061");
+ sb.append("\uff5f");
+ sb.append("\062");
+ sb.append("\uff5f");
+ sb.append("\063");
+ sb.append("\uff5f");
+ sb.append("\064");
+ sb.append("\uff5f");
+ sb.append("\071");
+ sb.append("\uff5f");
+ sb.append("\072");
+ sb.append("\uff5f");
+ sb.append("\074");
+ sb.append("\uff5f");
+ sb.append("\075");
+ sb.append("\uff5f");
+ sb.append("\076");
+ sb.append("\uff5f");
+ sb.append("\077");
+ sb.append("\uff5f");
+ sb.append("\100");
+ sb.append("\uff5f");
+ sb.append("\101");
+ sb.append("\uff5f");
+ sb.append("\102");
+ sb.append("\uff5f");
+ sb.append("\106");
+ sb.append("\uff5f");
+ sb.append("\107");
+ sb.append("\uff5f");
+ sb.append("\111");
+ sb.append("\uff5f");
+ sb.append("\112");
+ sb.append("\uff5f");
+ sb.append("\113");
+ sb.append("\uff5f");
+ sb.append("\114");
+ sb.append("\uff5f");
+ sb.append("\115");
+ sb.append("\uff5f");
+ sb.append("\116");
+ sb.append("\uff5f");
+ sb.append("\117");
+ sb.append("\uff5f");
+ sb.append("\120");
+ sb.append("\uff5f");
+ sb.append("\121");
+ sb.append("\uff5f");
+ sb.append("\122");
+ sb.append("\uff5f");
+ sb.append("\123");
+ sb.append("\uff5f");
+ sb.append("\130");
+ sb.append("\uff5f");
+ sb.append("\146");
+ sb.append("\uff5f");
+ sb.append("\167");
+ sb.append("\uff5f");
+ sb.append("\170");
+ sb.append("\uff5f");
+ sb.append("\174");
+ sb.append("\uff5f");
+ sb.append("\175");
+ sb.append("\uff5f");
+ sb.append("\177");
+ sb.append("\uff5f");
+ sb.append("\200");
+ sb.append("\uff5f");
+ sb.append("\201");
+ sb.append("\uff5f");
+ sb.append("\202");
+ sb.append("\uff5f");
+ sb.append("\203");
+ sb.append("\uff5f");
+ sb.append("\204");
+ sb.append("\uff5f");
+ sb.append("\205");
+ sb.append("\uff5f");
+ sb.append("\206");
+ sb.append("\uff5f");
+ sb.append("\207");
+ sb.append("\uff5f");
+ sb.append("\210");
+ sb.append("\uff5f");
+ sb.append("\211");
+ sb.append("\uff5f");
+ sb.append("\213");
+ sb.append("\uff5f");
+ sb.append("\214");
+ sb.append("\uff5f");
+ sb.append("\215");
+ sb.append("\uff5f");
+ sb.append("\216");
+ sb.append("\uff5f");
+ sb.append("\217");
+ sb.append("\uff5f");
+ sb.append("\220");
+ sb.append("\uff5f");
+ sb.append("\221");
+ sb.append("\uff5f");
+ sb.append("\225");
+ sb.append("\uff5f");
+ sb.append("\230");
+ sb.append("\uff5f");
+ sb.append("\231");
+ sb.append("\uff5f");
+ sb.append("\232");
+ sb.append("\uff5f");
+ sb.append("\233");
+ sb.append("\uff5f");
+ sb.append("\235");
+ sb.append("\uff5f");
+ sb.append("\001");
+ sb.append("\002");
+ sb.append("\000");
+ sb.append("\012");
+ sb.append("\010");
+ sb.append("\314");
+ sb.append("\111");
+ sb.append("\u0253");
+ sb.append("\114");
+ sb.append("\u0250");
+ sb.append("\116");
+ sb.append("\065");
+ sb.append("\001");
+ sb.append("\002");
+ sb.append("\000");
+ sb.append("\004");
+ sb.append("\012");
+ sb.append("\u04e4");
+ sb.append("\001");
+ sb.append("\002");
+ sb.append("\000");
+ sb.append("\004");
+ sb.append("\226");
+ sb.append("\u04e5");
}
}
\ 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 5a3d898..a197467 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,192 +28,12 @@ public class EncodedActionTable13 {
}
protected EncodedActionTable13() {
sb = new StringBuilder();
- sb.append("\026");
- sb.append("\uff5f");
- sb.append("\027");
- sb.append("\uff5f");
- sb.append("\030");
- sb.append("\uff5f");
- sb.append("\032");
- sb.append("\uff5f");
- sb.append("\034");
- sb.append("\uff5f");
- sb.append("\035");
- sb.append("\uff5f");
- sb.append("\036");
- sb.append("\uff5f");
- sb.append("\037");
- sb.append("\uff5f");
- sb.append("\040");
- sb.append("\uff5f");
- sb.append("\041");
- sb.append("\uff5f");
- sb.append("\042");
- sb.append("\uff5f");
- sb.append("\043");
- sb.append("\uff5f");
- sb.append("\044");
- sb.append("\uff5f");
- sb.append("\045");
- sb.append("\uff5f");
- sb.append("\046");
- sb.append("\uff5f");
- sb.append("\047");
- sb.append("\uff5f");
- sb.append("\050");
- sb.append("\uff5f");
- sb.append("\052");
- sb.append("\uff5f");
- sb.append("\054");
- sb.append("\uff5f");
- sb.append("\055");
- sb.append("\uff5f");
- sb.append("\057");
- sb.append("\uff5f");
- sb.append("\060");
- sb.append("\uff5f");
- sb.append("\061");
- sb.append("\uff5f");
- sb.append("\062");
- sb.append("\uff5f");
- sb.append("\063");
- sb.append("\uff5f");
- sb.append("\064");
- sb.append("\uff5f");
- sb.append("\071");
- sb.append("\uff5f");
- sb.append("\072");
- sb.append("\uff5f");
- sb.append("\074");
- sb.append("\uff5f");
- sb.append("\075");
- sb.append("\uff5f");
- sb.append("\076");
- sb.append("\uff5f");
- sb.append("\077");
- sb.append("\uff5f");
- sb.append("\100");
- sb.append("\uff5f");
- sb.append("\101");
- sb.append("\uff5f");
- sb.append("\102");
- sb.append("\uff5f");
- sb.append("\106");
- sb.append("\uff5f");
- sb.append("\107");
- sb.append("\uff5f");
- sb.append("\111");
- sb.append("\uff5f");
- sb.append("\112");
- sb.append("\uff5f");
- sb.append("\113");
- sb.append("\uff5f");
- sb.append("\114");
- sb.append("\uff5f");
- sb.append("\115");
- sb.append("\uff5f");
- sb.append("\116");
- sb.append("\uff5f");
- sb.append("\117");
- sb.append("\uff5f");
- sb.append("\120");
- sb.append("\uff5f");
- sb.append("\121");
- sb.append("\uff5f");
- sb.append("\122");
- sb.append("\uff5f");
- sb.append("\123");
- sb.append("\uff5f");
- sb.append("\130");
- sb.append("\uff5f");
- sb.append("\146");
- sb.append("\uff5f");
- sb.append("\167");
- sb.append("\uff5f");
- sb.append("\170");
- sb.append("\uff5f");
- sb.append("\174");
- sb.append("\uff5f");
- sb.append("\175");
- sb.append("\uff5f");
- sb.append("\177");
- sb.append("\uff5f");
- sb.append("\200");
- sb.append("\uff5f");
- sb.append("\201");
- sb.append("\uff5f");
- sb.append("\202");
- sb.append("\uff5f");
- sb.append("\203");
- sb.append("\uff5f");
- sb.append("\204");
- sb.append("\uff5f");
- sb.append("\205");
- sb.append("\uff5f");
- sb.append("\206");
- sb.append("\uff5f");
- sb.append("\207");
- sb.append("\uff5f");
- sb.append("\210");
- sb.append("\uff5f");
- sb.append("\211");
- sb.append("\uff5f");
- sb.append("\213");
- sb.append("\uff5f");
- sb.append("\214");
- sb.append("\uff5f");
- sb.append("\215");
- sb.append("\uff5f");
- sb.append("\216");
- sb.append("\uff5f");
- sb.append("\217");
- sb.append("\uff5f");
- sb.append("\220");
- sb.append("\uff5f");
- sb.append("\221");
- sb.append("\uff5f");
- sb.append("\225");
- sb.append("\uff5f");
- sb.append("\230");
- sb.append("\uff5f");
- sb.append("\231");
- sb.append("\uff5f");
- sb.append("\232");
- sb.append("\uff5f");
- sb.append("\233");
- sb.append("\uff5f");
- sb.append("\235");
- sb.append("\uff5f");
- sb.append("\001");
- sb.append("\002");
- sb.append("\000");
- sb.append("\012");
- sb.append("\010");
- sb.append("\314");
- sb.append("\111");
- sb.append("\u0253");
- sb.append("\114");
- sb.append("\u0250");
- sb.append("\116");
- sb.append("\065");
- sb.append("\001");
- sb.append("\002");
- sb.append("\000");
- sb.append("\004");
- sb.append("\012");
- sb.append("\u04e6");
- sb.append("\001");
- sb.append("\002");
- sb.append("\000");
- sb.append("\004");
- sb.append("\226");
- sb.append("\u04e7");
sb.append("\001");
sb.append("\002");
sb.append("\000");
sb.append("\004");
sb.append("\106");
- sb.append("\u04e8");
+ sb.append("\u04e6");
sb.append("\001");
sb.append("\002");
sb.append("\000");
@@ -481,7 +301,7 @@ public class EncodedActionTable13 {
sb.append("\106");
sb.append("\075");
sb.append("\107");
- sb.append("\u04ea");
+ sb.append("\u04e8");
sb.append("\111");
sb.append("\216");
sb.append("\112");
@@ -923,13 +743,13 @@ public class EncodedActionTable13 {
sb.append("\012");
sb.append("\072");
sb.append("\015");
- sb.append("\u0428");
+ sb.append("\u0426");
sb.append("\103");
- sb.append("\u04ee");
+ sb.append("\u04ec");
sb.append("\104");
- sb.append("\u0427");
+ sb.append("\u0425");
sb.append("\105");
- sb.append("\u0426");
+ sb.append("\u0424");
sb.append("\001");
sb.append("\002");
sb.append("\000");
@@ -1393,13 +1213,13 @@ public class EncodedActionTable13 {
sb.append("\000");
sb.append("\004");
sb.append("\146");
- sb.append("\u04f6");
+ sb.append("\u04f4");
sb.append("\001");
sb.append("\002");
sb.append("\000");
sb.append("\010");
sb.append("\124");
- sb.append("\u04f4");
+ sb.append("\u04f2");
sb.append("\146");
sb.append("\ufea8");
sb.append("\226");
@@ -1703,7 +1523,7 @@ public class EncodedActionTable13 {
sb.append("\000");
sb.append("\004");
sb.append("\146");
- sb.append("\u04f8");
+ sb.append("\u04f6");
sb.append("\001");
sb.append("\002");
sb.append("\000");
@@ -1823,7 +1643,7 @@ public class EncodedActionTable13 {
sb.append("\000");
sb.append("\004");
sb.append("\226");
- sb.append("\u04fa");
+ sb.append("\u04f8");
sb.append("\001");
sb.append("\002");
sb.append("\000");
@@ -1977,7 +1797,7 @@ public class EncodedActionTable13 {
sb.append("\225");
sb.append("\203");
sb.append("\227");
- sb.append("\u04fc");
+ sb.append("\u04fa");
sb.append("\230");
sb.append("\120");
sb.append("\231");
@@ -2589,7 +2409,7 @@ public class EncodedActionTable13 {
sb.append("\023");
sb.append("\035");
sb.append("\024");
- sb.append("\u04ff");
+ sb.append("\u04fd");
sb.append("\025");
sb.append("\121");
sb.append("\027");
@@ -2731,7 +2551,7 @@ public class EncodedActionTable13 {
sb.append("\000");
sb.append("\004");
sb.append("\146");
- sb.append("\u0500");
+ sb.append("\u04fe");
sb.append("\001");
sb.append("\002");
sb.append("\000");
@@ -3129,7 +2949,7 @@ public class EncodedActionTable13 {
sb.append("\200");
sb.append("\ufdbf");
sb.append("\226");
- sb.append("\u0505");
+ sb.append("\u0503");
sb.append("\237");
sb.append("\ufdc1");
sb.append("\240");
@@ -3197,7 +3017,7 @@ public class EncodedActionTable13 {
sb.append("\176");
sb.append("\ufdc5");
sb.append("\226");
- sb.append("\u0504");
+ sb.append("\u0502");
sb.append("\237");
sb.append("\ufdc5");
sb.append("\242");
@@ -3519,9 +3339,9 @@ public class EncodedActionTable13 {
sb.append("\000");
sb.append("\012");
sb.append("\033");
- sb.append("\u052d");
+ sb.append("\u052b");
sb.append("\114");
- sb.append("\u052c");
+ sb.append("\u052a");
sb.append("\124");
sb.append("\uff9c");
sb.append("\146");
@@ -3533,7 +3353,7 @@ public class EncodedActionTable13 {
sb.append("\010");
sb.append("\314");
sb.append("\114");
- sb.append("\u050b");
+ sb.append("\u0509");
sb.append("\116");
sb.append("\065");
sb.append("\001");
@@ -3559,7 +3379,7 @@ public class EncodedActionTable13 {
sb.append("\010");
sb.append("\314");
sb.append("\114");
- sb.append("\u050b");
+ sb.append("\u0509");
sb.append("\116");
sb.append("\065");
sb.append("\001");
@@ -3567,9 +3387,9 @@ public class EncodedActionTable13 {
sb.append("\000");
sb.append("\006");
sb.append("\124");
- sb.append("\u050e");
+ sb.append("\u050c");
sb.append("\146");
- sb.append("\u050f");
+ sb.append("\u050d");
sb.append("\001");
sb.append("\002");
sb.append("\000");
@@ -3577,7 +3397,7 @@ public class EncodedActionTable13 {
sb.append("\010");
sb.append("\314");
sb.append("\114");
- sb.append("\u050b");
+ sb.append("\u0509");
sb.append("\116");
sb.append("\065");
sb.append("\001");
@@ -3771,9 +3591,9 @@ public class EncodedActionTable13 {
sb.append("\000");
sb.append("\006");
sb.append("\124");
- sb.append("\u050e");
+ sb.append("\u050c");
sb.append("\146");
- sb.append("\u0512");
+ sb.append("\u0510");
sb.append("\001");
sb.append("\002");
sb.append("\000");
@@ -3957,9 +3777,9 @@ public class EncodedActionTable13 {
sb.append("\000");
sb.append("\012");
sb.append("\033");
- sb.append("\u0515");
+ sb.append("\u0513");
sb.append("\114");
- sb.append("\u0514");
+ sb.append("\u0512");
sb.append("\124");
sb.append("\uff99");
sb.append("\146");
@@ -3971,13 +3791,13 @@ public class EncodedActionTable13 {
sb.append("\010");
sb.append("\323");
sb.append("\106");
- sb.append("\u0517");
+ sb.append("\u0515");
sb.append("\001");
sb.append("\002");
sb.append("\000");
sb.append("\004");
sb.append("\010");
- sb.append("\u0516");
+ sb.append("\u0514");
sb.append("\001");
sb.append("\002");
sb.append("\000");
@@ -3993,9 +3813,9 @@ public class EncodedActionTable13 {
sb.append("\010");
sb.append("\314");
sb.append("\043");
- sb.append("\u0519");
+ sb.append("\u0517");
sb.append("\044");
- sb.append("\u051a");
+ sb.append("\u0518");
sb.append("\107");
sb.append("\uff95");
sb.append("\116");
@@ -4031,19 +3851,19 @@ public class EncodedActionTable13 {
sb.append("\107");
sb.append("\ufdd7");
sb.append("\124");
- sb.append("\u0521");
+ sb.append("\u051f");
sb.append("\001");
sb.append("\002");
sb.append("\000");
sb.append("\004");
sb.append("\107");
- sb.append("\u0520");
+ sb.append("\u051e");
sb.append("\001");
sb.append("\002");
sb.append("\000");
sb.append("\012");
sb.append("\033");
- sb.append("\u051e");
+ sb.append("\u051c");
sb.append("\107");
sb.append("\uff92");
sb.append("\114");
@@ -4055,7 +3875,7 @@ public class EncodedActionTable13 {
sb.append("\000");
sb.append("\004");
sb.append("\010");
- sb.append("\u051f");
+ sb.append("\u051d");
sb.append("\001");
sb.append("\002");
sb.append("\000");
@@ -4079,9 +3899,9 @@ public class EncodedActionTable13 {
sb.append("\010");
sb.append("\314");
sb.append("\043");
- sb.append("\u0519");
+ sb.append("\u0517");
sb.append("\044");
- sb.append("\u051a");
+ sb.append("\u0518");
sb.append("\107");
sb.append("\ufdd6");
sb.append("\116");
@@ -4105,7 +3925,7 @@ public class EncodedActionTable13 {
sb.append("\000");
sb.append("\012");
sb.append("\033");
- sb.append("\u0525");
+ sb.append("\u0523");
sb.append("\107");
sb.append("\uff8e");
sb.append("\114");
@@ -4117,7 +3937,7 @@ public class EncodedActionTable13 {
sb.append("\000");
sb.append("\004");
sb.append("\010");
- sb.append("\u0526");
+ sb.append("\u0524");
sb.append("\001");
sb.append("\002");
sb.append("\000");
@@ -4131,7 +3951,7 @@ public class EncodedActionTable13 {
sb.append("\000");
sb.append("\012");
sb.append("\033");
- sb.append("\u0528");
+ sb.append("\u0526");
sb.append("\107");
sb.append("\uff90");
sb.append("\114");
@@ -4143,7 +3963,7 @@ public class EncodedActionTable13 {
sb.append("\000");
sb.append("\004");
sb.append("\010");
- sb.append("\u0529");
+ sb.append("\u0527");
sb.append("\001");
sb.append("\002");
sb.append("\000");
@@ -4157,9 +3977,9 @@ public class EncodedActionTable13 {
sb.append("\000");
sb.append("\006");
sb.append("\124");
- sb.append("\u050e");
+ sb.append("\u050c");
sb.append("\146");
- sb.append("\u052b");
+ sb.append("\u0529");
sb.append("\001");
sb.append("\002");
sb.append("\000");
@@ -4345,13 +4165,13 @@ public class EncodedActionTable13 {
sb.append("\010");
sb.append("\323");
sb.append("\106");
- sb.append("\u052f");
+ sb.append("\u052d");
sb.append("\001");
sb.append("\002");
sb.append("\000");
sb.append("\004");
sb.append("\010");
- sb.append("\u052e");
+ sb.append("\u052c");
sb.append("\001");
sb.append("\002");
sb.append("\000");
@@ -4367,9 +4187,9 @@ public class EncodedActionTable13 {
sb.append("\010");
sb.append("\314");
sb.append("\043");
- sb.append("\u0519");
+ sb.append("\u0517");
sb.append("\044");
- sb.append("\u051a");
+ sb.append("\u0518");
sb.append("\107");
sb.append("\uff95");
sb.append("\116");
@@ -4379,7 +4199,7 @@ public class EncodedActionTable13 {
sb.append("\000");
sb.append("\004");
sb.append("\107");
- sb.append("\u0531");
+ sb.append("\u052f");
sb.append("\001");
sb.append("\002");
sb.append("\000");
@@ -4501,7 +4321,7 @@ public class EncodedActionTable13 {
sb.append("\061");
sb.append("\032");
sb.append("\071");
- sb.append("\u02fa");
+ sb.append("\u02f9");
sb.append("\072");
sb.append("\014");
sb.append("\074");
@@ -4528,5 +4348,185 @@ public class EncodedActionTable13 {
sb.append("\077");
sb.append("\116");
sb.append("\065");
+ sb.append("\117");
+ sb.append("\031");
+ sb.append("\120");
+ sb.append("\104");
+ sb.append("\121");
+ sb.append("\057");
+ sb.append("\122");
+ sb.append("\152");
+ sb.append("\123");
+ sb.append("\126");
+ sb.append("\124");
+ sb.append("\ufd7a");
+ sb.append("\130");
+ sb.append("\074");
+ sb.append("\153");
+ sb.append("\u02f3");
+ sb.append("\167");
+ sb.append("\124");
+ sb.append("\170");
+ sb.append("\103");
+ sb.append("\174");
+ sb.append("\176");
+ sb.append("\175");
+ sb.append("\016");
+ sb.append("\177");
+ sb.append("\062");
+ sb.append("\200");
+ sb.append("\204");
+ sb.append("\201");
+ sb.append("\030");
+ sb.append("\202");
+ sb.append("\162");
+ sb.append("\203");
+ sb.append("\042");
+ sb.append("\204");
+ sb.append("\153");
+ sb.append("\205");
+ sb.append("\110");
+ sb.append("\206");
+ sb.append("\164");
+ sb.append("\207");
+ sb.append("\106");
+ sb.append("\210");
+ sb.append("\040");
+ sb.append("\211");
+ sb.append("\061");
+ sb.append("\213");
+ sb.append("\114");
+ sb.append("\217");
+ sb.append("\215");
+ sb.append("\225");
+ sb.append("\220");
+ sb.append("\226");
+ sb.append("\ufd7a");
+ sb.append("\230");
+ sb.append("\120");
+ sb.append("\231");
+ sb.append("\134");
+ sb.append("\232");
+ sb.append("\070");
+ sb.append("\233");
+ sb.append("\143");
+ sb.append("\001");
+ sb.append("\002");
+ sb.append("\000");
+ sb.append("\004");
+ sb.append("\226");
+ sb.append("\u0534");
+ sb.append("\001");
+ sb.append("\002");
+ sb.append("\000");
+ sb.append("\122");
+ sb.append("\031");
+ sb.append("\ufd9b");
+ sb.append("\033");
+ sb.append("\ufd9b");
+ sb.append("\070");
+ sb.append("\ufd9b");
+ sb.append("\106");
+ sb.append("\ufd9b");
+ sb.append("\107");
+ sb.append("\ufd9b");
+ sb.append("\124");
+ sb.append("\ufd9b");
+ sb.append("\125");
+ sb.append("\ufd9b");
+ sb.append("\126");
+ sb.append("\ufd9b");
+ sb.append("\127");
+ sb.append("\ufd9b");
+ sb.append("\145");
+ sb.append("\ufd9b");
+ sb.append("\146");
+ sb.append("\ufd9b");
+ sb.append("\147");
+ sb.append("\ufd9b");
+ sb.append("\150");
+ sb.append("\ufd9b");
+ sb.append("\151");
+ sb.append("\ufd9b");
+ sb.append("\152");
+ sb.append("\ufd9b");
+ sb.append("\153");
+ sb.append("\ufd9b");
+ sb.append("\154");
+ sb.append("\ufd9b");
+ sb.append("\155");
+ sb.append("\ufd9b");
+ sb.append("\156");
+ sb.append("\ufd9b");
+ sb.append("\157");
+ sb.append("\ufd9b");
+ sb.append("\160");
+ sb.append("\ufd9b");
+ sb.append("\161");
+ sb.append("\ufd9b");
+ sb.append("\162");
+ sb.append("\ufd9b");
+ sb.append("\163");
+ sb.append("\ufd9b");
+ sb.append("\164");
+ sb.append("\ufd9b");
+ sb.append("\165");
+ sb.append("\ufd9b");
+ sb.append("\166");
+ sb.append("\ufd9b");
+ sb.append("\167");
+ sb.append("\ufd9b");
+ sb.append("\170");
+ sb.append("\ufd9b");
+ sb.append("\171");
+ sb.append("\ufd9b");
+ sb.append("\172");
+ sb.append("\ufd9b");
+ sb.append("\173");
+ sb.append("\ufd9b");
+ sb.append("\176");
+ sb.append("\ufd9b");
+ sb.append("\211");
+ sb.append("\ufd9b");
+ sb.append("\212");
+ sb.append("\ufd9b");
+ sb.append("\225");
+ sb.append("\ufd9b");
+ sb.append("\226");
+ sb.append("\ufd9b");
+ sb.append("\227");
+ sb.append("\ufd9b");
+ sb.append("\237");
+ sb.append("\ufd9b");
+ sb.append("\242");
+ sb.append("\ufd9b");
+ sb.append("\001");
+ sb.append("\002");
+ sb.append("\000");
+ sb.append("\114");
+ sb.append("\031");
+ sb.append("\257");
+ sb.append("\033");
+ sb.append("\ufdcd");
+ sb.append("\070");
+ sb.append("\u0538");
+ sb.append("\107");
+ sb.append("\ufdcd");
+ sb.append("\124");
+ sb.append("\ufdcd");
+ sb.append("\125");
+ sb.append("\ufdcd");
+ sb.append("\126");
+ sb.append("\ufdcd");
+ sb.append("\127");
+ sb.append("\ufdcd");
+ sb.append("\145");
+ sb.append("\242");
+ sb.append("\146");
+ sb.append("\ufdcd");
+ sb.append("\147");
+ sb.append("\235");
+ sb.append("\150");
+ sb.append("\261");
}
}
\ 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 1c77245..55db638 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,186 +28,6 @@ public class EncodedActionTable14 {
}
protected EncodedActionTable14() {
sb = new StringBuilder();
- sb.append("\117");
- sb.append("\031");
- sb.append("\120");
- sb.append("\104");
- sb.append("\121");
- sb.append("\057");
- sb.append("\122");
- sb.append("\152");
- sb.append("\123");
- sb.append("\126");
- sb.append("\124");
- sb.append("\ufd7a");
- sb.append("\130");
- sb.append("\074");
- sb.append("\153");
- sb.append("\u02f4");
- sb.append("\167");
- sb.append("\124");
- sb.append("\170");
- sb.append("\103");
- sb.append("\174");
- sb.append("\176");
- sb.append("\175");
- sb.append("\016");
- sb.append("\177");
- sb.append("\062");
- sb.append("\200");
- sb.append("\204");
- sb.append("\201");
- sb.append("\030");
- sb.append("\202");
- sb.append("\162");
- sb.append("\203");
- sb.append("\042");
- sb.append("\204");
- sb.append("\153");
- sb.append("\205");
- sb.append("\110");
- sb.append("\206");
- sb.append("\164");
- sb.append("\207");
- sb.append("\106");
- sb.append("\210");
- sb.append("\040");
- sb.append("\211");
- sb.append("\061");
- sb.append("\213");
- sb.append("\114");
- sb.append("\217");
- sb.append("\215");
- sb.append("\225");
- sb.append("\220");
- sb.append("\226");
- sb.append("\ufd7a");
- sb.append("\230");
- sb.append("\120");
- sb.append("\231");
- sb.append("\134");
- sb.append("\232");
- sb.append("\070");
- sb.append("\233");
- sb.append("\143");
- sb.append("\001");
- sb.append("\002");
- sb.append("\000");
- sb.append("\004");
- sb.append("\226");
- sb.append("\u0536");
- sb.append("\001");
- sb.append("\002");
- sb.append("\000");
- sb.append("\122");
- sb.append("\031");
- sb.append("\ufd9b");
- sb.append("\033");
- sb.append("\ufd9b");
- sb.append("\070");
- sb.append("\ufd9b");
- sb.append("\106");
- sb.append("\ufd9b");
- sb.append("\107");
- sb.append("\ufd9b");
- sb.append("\124");
- sb.append("\ufd9b");
- sb.append("\125");
- sb.append("\ufd9b");
- sb.append("\126");
- sb.append("\ufd9b");
- sb.append("\127");
- sb.append("\ufd9b");
- sb.append("\145");
- sb.append("\ufd9b");
- sb.append("\146");
- sb.append("\ufd9b");
- sb.append("\147");
- sb.append("\ufd9b");
- sb.append("\150");
- sb.append("\ufd9b");
- sb.append("\151");
- sb.append("\ufd9b");
- sb.append("\152");
- sb.append("\ufd9b");
- sb.append("\153");
- sb.append("\ufd9b");
- sb.append("\154");
- sb.append("\ufd9b");
- sb.append("\155");
- sb.append("\ufd9b");
- sb.append("\156");
- sb.append("\ufd9b");
- sb.append("\157");
- sb.append("\ufd9b");
- sb.append("\160");
- sb.append("\ufd9b");
- sb.append("\161");
- sb.append("\ufd9b");
- sb.append("\162");
- sb.append("\ufd9b");
- sb.append("\163");
- sb.append("\ufd9b");
- sb.append("\164");
- sb.append("\ufd9b");
- sb.append("\165");
- sb.append("\ufd9b");
- sb.append("\166");
- sb.append("\ufd9b");
- sb.append("\167");
- sb.append("\ufd9b");
- sb.append("\170");
- sb.append("\ufd9b");
- sb.append("\171");
- sb.append("\ufd9b");
- sb.append("\172");
- sb.append("\ufd9b");
- sb.append("\173");
- sb.append("\ufd9b");
- sb.append("\176");
- sb.append("\ufd9b");
- sb.append("\211");
- sb.append("\ufd9b");
- sb.append("\212");
- sb.append("\ufd9b");
- sb.append("\225");
- sb.append("\ufd9b");
- sb.append("\226");
- sb.append("\ufd9b");
- sb.append("\227");
- sb.append("\ufd9b");
- sb.append("\237");
- sb.append("\ufd9b");
- sb.append("\242");
- sb.append("\ufd9b");
- sb.append("\001");
- sb.append("\002");
- sb.append("\000");
- sb.append("\114");
- sb.append("\031");
- sb.append("\257");
- sb.append("\033");
- sb.append("\ufdcd");
- sb.append("\070");
- sb.append("\u053a");
- sb.append("\107");
- sb.append("\ufdcd");
- sb.append("\124");
- sb.append("\ufdcd");
- sb.append("\125");
- sb.append("\ufdcd");
- sb.append("\126");
- sb.append("\ufdcd");
- sb.append("\127");
- sb.append("\ufdcd");
- sb.append("\145");
- sb.append("\242");
- sb.append("\146");
- sb.append("\ufdcd");
- sb.append("\147");
- sb.append("\235");
- sb.append("\150");
- sb.append("\261");
sb.append("\151");
sb.append("\237");
sb.append("\152");
@@ -609,9 +429,9 @@ public class EncodedActionTable14 {
sb.append("\000");
sb.append("\006");
sb.append("\124");
- sb.append("\u0545");
+ sb.append("\u0543");
sb.append("\146");
- sb.append("\u0546");
+ sb.append("\u0544");
sb.append("\001");
sb.append("\002");
sb.append("\000");
@@ -633,7 +453,7 @@ public class EncodedActionTable14 {
sb.append("\072");
sb.append("\014");
sb.append("\106");
- sb.append("\u0542");
+ sb.append("\u0540");
sb.append("\111");
sb.append("\u0108");
sb.append("\114");
@@ -791,7 +611,7 @@ public class EncodedActionTable14 {
sb.append("\031");
sb.append("\257");
sb.append("\107");
- sb.append("\u0544");
+ sb.append("\u0542");
sb.append("\125");
sb.append("\246");
sb.append("\126");
@@ -861,9 +681,9 @@ public class EncodedActionTable14 {
sb.append("\000");
sb.append("\006");
sb.append("\012");
- sb.append("\u053d");
+ sb.append("\u053b");
sb.append("\230");
- sb.append("\u053e");
+ sb.append("\u053c");
sb.append("\001");
sb.append("\002");
sb.append("\000");
@@ -1193,7 +1013,7 @@ public class EncodedActionTable14 {
sb.append("\000");
sb.append("\004");
sb.append("\226");
- sb.append("\u054a");
+ sb.append("\u0548");
sb.append("\001");
sb.append("\002");
sb.append("\000");
diff --git a/php/php.editor/src/org/netbeans/modules/php/editor/parser/EncodedActionTable4.java b/php/php.editor/src/org/netbeans/modules/php/editor/parser/EncodedActionTable4.java
index ea8c77e..6b07983 100644
--- a/php/php.editor/src/org/netbeans/modules/php/editor/parser/EncodedActionTable4.java
+++ b/php/php.editor/src/org/netbeans/modules/php/editor/parser/EncodedActionTable4.java
@@ -385,27 +385,13 @@ public class EncodedActionTable4 {
sb.append("\001");
sb.append("\002");
sb.append("\000");
- sb.append("\034");
- sb.append("\010");
- sb.append("\ufece");
+ sb.append("\016");
sb.append("\012");
sb.append("\ufece");
sb.append("\043");
sb.append("\ufec6");
sb.append("\044");
sb.append("\ufecf");
- sb.append("\072");
- sb.append("\ufece");
- sb.append("\073");
- sb.append("\ufece");
- sb.append("\111");
- sb.append("\ufece");
- sb.append("\114");
- sb.append("\ufece");
- sb.append("\116");
- sb.append("\ufece");
- sb.append("\145");
- sb.append("\ufece");
sb.append("\217");
sb.append("\u0263");
sb.append("\220");
@@ -417,7 +403,7 @@ public class EncodedActionTable4 {
sb.append("\000");
sb.append("\004");
sb.append("\044");
- sb.append("\u02db");
+ sb.append("\u02da");
sb.append("\001");
sb.append("\002");
sb.append("\000");
@@ -449,47 +435,19 @@ public class EncodedActionTable4 {
sb.append("\001");
sb.append("\002");
sb.append("\000");
- sb.append("\022");
- sb.append("\010");
- sb.append("\ufeca");
+ sb.append("\004");
sb.append("\012");
sb.append("\ufeca");
- sb.append("\072");
- sb.append("\ufeca");
- sb.append("\073");
- sb.append("\ufeca");
- sb.append("\111");
- sb.append("\ufeca");
- sb.append("\114");
- sb.append("\ufeca");
- sb.append("\116");
- sb.append("\ufeca");
- sb.append("\145");
- sb.append("\ufeca");
sb.append("\001");
sb.append("\002");
sb.append("\000");
- sb.append("\034");
- sb.append("\010");
- sb.append("\ufeb7");
+ sb.append("\016");
sb.append("\012");
sb.append("\ufeb7");
sb.append("\043");
sb.append("\ufeb7");
sb.append("\044");
sb.append("\ufeb7");
- sb.append("\072");
- sb.append("\ufeb7");
- sb.append("\073");
- sb.append("\ufeb7");
- sb.append("\111");
- sb.append("\ufeb7");
- sb.append("\114");
- sb.append("\ufeb7");
- sb.append("\116");
- sb.append("\ufeb7");
- sb.append("\145");
- sb.append("\ufeb7");
sb.append("\217");
sb.append("\ufeb7");
sb.append("\220");
@@ -503,33 +461,19 @@ public class EncodedActionTable4 {
sb.append("\010");
sb.append("\314");
sb.append("\114");
- sb.append("\u02b1");
+ sb.append("\u02b0");
sb.append("\116");
sb.append("\065");
sb.append("\001");
sb.append("\002");
sb.append("\000");
- sb.append("\034");
- sb.append("\010");
- sb.append("\ufeb8");
+ sb.append("\016");
sb.append("\012");
sb.append("\ufeb8");
sb.append("\043");
sb.append("\ufeb8");
sb.append("\044");
sb.append("\ufeb8");
- sb.append("\072");
- sb.append("\ufeb8");
- sb.append("\073");
- sb.append("\ufeb8");
- sb.append("\111");
- sb.append("\ufeb8");
- sb.append("\114");
- sb.append("\ufeb8");
- sb.append("\116");
- sb.append("\ufeb8");
- sb.append("\145");
- sb.append("\ufeb8");
sb.append("\217");
sb.append("\ufeb8");
sb.append("\220");
@@ -539,25 +483,11 @@ public class EncodedActionTable4 {
sb.append("\001");
sb.append("\002");
sb.append("\000");
- sb.append("\036");
- sb.append("\010");
- sb.append("\ufeb9");
+ sb.append("\020");
sb.append("\012");
sb.append("\ufeb9");
sb.append("\043");
sb.append("\ufeb9");
- sb.append("\072");
- sb.append("\ufeb9");
- sb.append("\073");
- sb.append("\ufeb9");
- sb.append("\111");
- sb.append("\ufeb9");
- sb.append("\114");
- sb.append("\ufeb9");
- sb.append("\116");
- sb.append("\ufeb9");
- sb.append("\145");
- sb.append("\ufeb9");
sb.append("\220");
sb.append("\ufeb9");
sb.append("\221");
@@ -663,23 +593,9 @@ public class EncodedActionTable4 {
sb.append("\001");
sb.append("\002");
sb.append("\000");
- sb.append("\022");
- sb.append("\010");
- sb.append("\314");
+ sb.append("\004");
sb.append("\012");
- sb.append("\uff05");
- sb.append("\072");
- sb.append("\u0272");
- sb.append("\073");
- sb.append("\u0275");
- sb.append("\111");
- sb.append("\u0253");
- sb.append("\114");
- sb.append("\u0250");
- sb.append("\116");
- sb.append("\065");
- sb.append("\145");
- sb.append("\u0276");
+ sb.append("\u02a6");
sb.append("\001");
sb.append("\002");
sb.append("\000");
@@ -711,25 +627,11 @@ public class EncodedActionTable4 {
sb.append("\001");
sb.append("\002");
sb.append("\000");
- sb.append("\036");
- sb.append("\010");
- sb.append("\ufecd");
+ sb.append("\020");
sb.append("\012");
sb.append("\ufecd");
sb.append("\043");
sb.append("\ufec7");
- sb.append("\072");
- sb.append("\ufecd");
- sb.append("\073");
- sb.append("\ufecd");
- sb.append("\111");
- sb.append("\ufecd");
- sb.append("\114");
- sb.append("\ufecd");
- sb.append("\116");
- sb.append("\ufecd");
- sb.append("\145");
- sb.append("\ufecd");
sb.append("\220");
sb.append("\u0264");
sb.append("\221");
@@ -743,27 +645,13 @@ public class EncodedActionTable4 {
sb.append("\001");
sb.append("\002");
sb.append("\000");
- sb.append("\034");
- sb.append("\010");
- sb.append("\ufeb6");
+ sb.append("\016");
sb.append("\012");
sb.append("\ufeb6");
sb.append("\043");
sb.append("\ufeb6");
sb.append("\044");
sb.append("\ufeb6");
- sb.append("\072");
- sb.append("\ufeb6");
- sb.append("\073");
- sb.append("\ufeb6");
- sb.append("\111");
- sb.append("\ufeb6");
- sb.append("\114");
- sb.append("\ufeb6");
- sb.append("\116");
- sb.append("\ufeb6");
- sb.append("\145");
- sb.append("\ufeb6");
sb.append("\217");
sb.append("\ufeb6");
sb.append("\220");
@@ -3135,25 +3023,11 @@ public class EncodedActionTable4 {
sb.append("\001");
sb.append("\002");
sb.append("\000");
- sb.append("\030");
- sb.append("\010");
- sb.append("\ufecc");
+ sb.append("\012");
sb.append("\012");
sb.append("\ufecc");
sb.append("\043");
sb.append("\ufec5");
- sb.append("\072");
- sb.append("\ufecc");
- sb.append("\073");
- sb.append("\ufecc");
- sb.append("\111");
- sb.append("\ufecc");
- sb.append("\114");
- sb.append("\ufecc");
- sb.append("\116");
- sb.append("\ufecc");
- sb.append("\145");
- sb.append("\ufecc");
sb.append("\220");
sb.append("\u0264");
sb.append("\221");
@@ -3205,17 +3079,11 @@ public class EncodedActionTable4 {
sb.append("\001");
sb.append("\002");
sb.append("\000");
- sb.append("\004");
- sb.append("\012");
- sb.append("\u02a7");
- sb.append("\001");
- sb.append("\002");
- sb.append("\000");
sb.append("\010");
sb.append("\124");
sb.append("\ufeb1");
sb.append("\131");
- sb.append("\u02ae");
+ sb.append("\u02ad");
sb.append("\146");
sb.append("\ufeb1");
sb.append("\001");
@@ -3223,15 +3091,15 @@ public class EncodedActionTable4 {
sb.append("\000");
sb.append("\006");
sb.append("\124");
- sb.append("\u02a9");
+ sb.append("\u02a8");
sb.append("\146");
- sb.append("\u02aa");
+ sb.append("\u02a9");
sb.append("\001");
sb.append("\002");
sb.append("\000");
sb.append("\004");
sb.append("\012");
- sb.append("\u02ab");
+ sb.append("\u02aa");
sb.append("\001");
sb.append("\002");
sb.append("\000");
@@ -3267,7 +3135,7 @@ public class EncodedActionTable4 {
sb.append("\124");
sb.append("\ufeb3");
sb.append("\131");
- sb.append("\u02ac");
+ sb.append("\u02ab");
sb.append("\146");
sb.append("\ufeb3");
sb.append("\001");
@@ -3403,11 +3271,11 @@ public class EncodedActionTable4 {
sb.append("\000");
sb.append("\010");
sb.append("\106");
- sb.append("\u02b6");
- sb.append("\124");
sb.append("\u02b5");
+ sb.append("\124");
+ sb.append("\u02b4");
sb.append("\146");
- sb.append("\u02b8");
+ sb.append("\u02b7");
sb.append("\001");
sb.append("\002");
sb.append("\000");
@@ -3457,7 +3325,7 @@ public class EncodedActionTable4 {
sb.append("\010");
sb.append("\314");
sb.append("\114");
- sb.append("\u02b1");
+ sb.append("\u02b0");
sb.append("\116");
sb.append("\065");
sb.append("\001");
@@ -3537,15 +3405,15 @@ public class EncodedActionTable4 {
sb.append("\000");
sb.append("\016");
sb.append("\010");
- sb.append("\u02c1");
+ sb.append("\u02c0");
sb.append("\107");
- sb.append("\u02be");
+ sb.append("\u02bd");
sb.append("\111");
sb.append("\320");
sb.append("\114");
sb.append("\305");
sb.append("\116");
- sb.append("\u02c0");
+ sb.append("\u02bf");
sb.append("\217");
sb.append("\311");
sb.append("\001");
@@ -3569,7 +3437,7 @@ public class EncodedActionTable4 {
sb.append("\000");
sb.append("\004");
sb.append("\033");
- sb.append("\u02d3");
+ sb.append("\u02d2");
sb.append("\001");
sb.append("\002");
sb.append("\000");
@@ -3591,7 +3459,7 @@ public class EncodedActionTable4 {
sb.append("\000");
sb.append("\004");
sb.append("\110");
- sb.append("\u02c2");
+ sb.append("\u02c1");
sb.append("\001");
sb.append("\002");
sb.append("\000");
@@ -3669,9 +3537,9 @@ public class EncodedActionTable4 {
sb.append("\000");
sb.append("\006");
sb.append("\033");
- sb.append("\u02c5");
- sb.append("\236");
sb.append("\u02c4");
+ sb.append("\236");
+ sb.append("\u02c3");
sb.append("\001");
sb.append("\002");
sb.append("\000");
@@ -3695,11 +3563,11 @@ public class EncodedActionTable4 {
sb.append("\116");
sb.append("\u011d");
sb.append("\222");
- sb.append("\u02c9");
+ sb.append("\u02c8");
sb.append("\223");
- sb.append("\u02ca");
+ sb.append("\u02c9");
sb.append("\224");
- sb.append("\u02c7");
+ sb.append("\u02c6");
sb.append("\001");
sb.append("\002");
sb.append("\000");
@@ -3723,7 +3591,7 @@ public class EncodedActionTable4 {
sb.append("\000");
sb.append("\004");
sb.append("\146");
- sb.append("\u02cb");
+ sb.append("\u02ca");
sb.append("\001");
sb.append("\002");
sb.append("\000");
@@ -3765,7 +3633,7 @@ public class EncodedActionTable4 {
sb.append("\000");
sb.append("\004");
sb.append("\146");
- sb.append("\u02cd");
+ sb.append("\u02cc");
sb.append("\001");
sb.append("\002");
sb.append("\000");
@@ -3787,9 +3655,9 @@ public class EncodedActionTable4 {
sb.append("\000");
sb.append("\006");
sb.append("\124");
- sb.append("\u02d0");
+ sb.append("\u02cf");
sb.append("\146");
- sb.append("\u02d1");
+ sb.append("\u02d0");
sb.append("\001");
sb.append("\002");
sb.append("\000");
@@ -3845,11 +3713,11 @@ public class EncodedActionTable4 {
sb.append("\116");
sb.append("\u011d");
sb.append("\222");
- sb.append("\u02c9");
+ sb.append("\u02c8");
sb.append("\223");
- sb.append("\u02ca");
+ sb.append("\u02c9");
sb.append("\224");
- sb.append("\u02c7");
+ sb.append("\u02c6");
sb.append("\001");
sb.append("\002");
sb.append("\000");
@@ -3859,13 +3727,13 @@ public class EncodedActionTable4 {
sb.append("\116");
sb.append("\u011d");
sb.append("\146");
- sb.append("\u02d8");
+ sb.append("\u02d7");
sb.append("\001");
sb.append("\002");
sb.append("\000");
sb.append("\004");
sb.append("\146");
- sb.append("\u02d6");
+ sb.append("\u02d5");
sb.append("\001");
sb.append("\002");
sb.append("\000");
@@ -3887,7 +3755,7 @@ public class EncodedActionTable4 {
sb.append("\000");
sb.append("\004");
sb.append("\146");
- sb.append("\u02d9");
+ sb.append("\u02d8");
sb.append("\001");
sb.append("\002");
sb.append("\000");
@@ -4087,9 +3955,9 @@ public class EncodedActionTable4 {
sb.append("\000");
sb.append("\006");
sb.append("\124");
- sb.append("\u02dd");
+ sb.append("\u02dc");
sb.append("\146");
- sb.append("\u02de");
+ sb.append("\u02dd");
sb.append("\001");
sb.append("\002");
sb.append("\000");
@@ -4275,7 +4143,7 @@ public class EncodedActionTable4 {
sb.append("\000");
sb.append("\004");
sb.append("\131");
- sb.append("\u02e0");
+ sb.append("\u02df");
sb.append("\001");
sb.append("\002");
sb.append("\000");
@@ -4401,7 +4269,7 @@ public class EncodedActionTable4 {
sb.append("\000");
sb.append("\004");
sb.append("\131");
- sb.append("\u02e3");
+ sb.append("\u02e2");
sb.append("\001");
sb.append("\002");
sb.append("\000");
@@ -4528,5 +4396,137 @@ public class EncodedActionTable4 {
sb.append("\006");
sb.append("\043");
sb.append("\ufec2");
+ sb.append("\217");
+ sb.append("\u0263");
+ sb.append("\001");
+ sb.append("\002");
+ sb.append("\000");
+ sb.append("\012");
+ sb.append("\012");
+ sb.append("\ufecb");
+ sb.append("\043");
+ sb.append("\ufec3");
+ sb.append("\220");
+ sb.append("\u0264");
+ sb.append("\221");
+ sb.append("\u0267");
+ sb.append("\001");
+ sb.append("\002");
+ sb.append("\000");
+ sb.append("\004");
+ sb.append("\043");
+ sb.append("\ufebd");
+ sb.append("\001");
+ sb.append("\002");
+ sb.append("\000");
+ sb.append("\004");
+ sb.append("\043");
+ sb.append("\ufebc");
+ sb.append("\001");
+ sb.append("\002");
+ sb.append("\000");
+ sb.append("\006");
+ sb.append("\066");
+ sb.append("\uff3a");
+ sb.append("\106");
+ sb.append("\uff3a");
+ sb.append("\001");
+ sb.append("\002");
+ sb.append("\000");
+ sb.append("\120");
+ sb.append("\031");
+ sb.append("\ufd97");
+ sb.append("\033");
+ sb.append("\ufd97");
+ sb.append("\067");
+ sb.append("\ufd97");
+ sb.append("\070");
+ sb.append("\ufd97");
+ sb.append("\107");
+ sb.append("\ufd97");
+ sb.append("\124");
+ sb.append("\ufd97");
+ sb.append("\125");
+ sb.append("\ufd97");
+ sb.append("\126");
+ sb.append("\ufd97");
+ sb.append("\127");
+ sb.append("\ufd97");
+ sb.append("\145");
+ sb.append("\ufd97");
+ sb.append("\146");
+ sb.append("\ufd97");
+ sb.append("\147");
+ sb.append("\ufd97");
+ sb.append("\150");
+ sb.append("\ufd97");
+ sb.append("\151");
+ sb.append("\ufd97");
+ sb.append("\152");
+ sb.append("\ufd97");
+ sb.append("\153");
+ sb.append("\ufd97");
+ sb.append("\154");
+ sb.append("\ufd97");
+ sb.append("\155");
+ sb.append("\ufd97");
+ sb.append("\156");
+ sb.append("\ufd97");
+ sb.append("\157");
+ sb.append("\ufd97");
+ sb.append("\160");
+ sb.append("\ufd97");
+ sb.append("\161");
+ sb.append("\ufd97");
+ sb.append("\162");
+ sb.append("\ufd97");
+ sb.append("\163");
+ sb.append("\ufd97");
+ sb.append("\164");
+ sb.append("\ufd97");
+ sb.append("\165");
+ sb.append("\ufd97");
+ sb.append("\166");
+ sb.append("\ufd97");
+ sb.append("\167");
+ sb.append("\ufd97");
+ sb.append("\170");
+ sb.append("\ufd97");
+ sb.append("\171");
+ sb.append("\ufd97");
+ sb.append("\172");
+ sb.append("\ufd97");
+ sb.append("\173");
+ sb.append("\ufd97");
+ sb.append("\176");
+ sb.append("\ufd97");
+ sb.append("\212");
+ sb.append("\ufd97");
+ sb.append("\225");
+ sb.append("\ufd97");
+ sb.append("\226");
+ sb.append("\ufd97");
+ sb.append("\227");
+ sb.append("\ufd97");
+ sb.append("\237");
+ sb.append("\ufd97");
+ sb.append("\242");
+ sb.append("\ufd97");
+ sb.append("\001");
+ sb.append("\002");
+ sb.append("\000");
+ sb.append("\124");
+ sb.append("\031");
+ sb.append("\ufd94");
+ sb.append("\033");
+ sb.append("\ufd94");
+ sb.append("\067");
+ sb.append("\ufd94");
+ sb.append("\070");
+ sb.append("\ufd94");
+ sb.append("\106");
+ sb.append("\u0112");
+ sb.append("\107");
+ sb.append("\ufd94");
}
}
\ No newline at end of file
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 226099e..ca42744 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
@@ -28,152 +28,6 @@ public class EncodedActionTable5 {
}
protected EncodedActionTable5() {
sb = new StringBuilder();
- sb.append("\217");
- sb.append("\u0263");
- sb.append("\001");
- sb.append("\002");
- sb.append("\000");
- sb.append("\030");
- sb.append("\010");
- sb.append("\ufecb");
- sb.append("\012");
- sb.append("\ufecb");
- sb.append("\043");
- sb.append("\ufec3");
- sb.append("\072");
- sb.append("\ufecb");
- sb.append("\073");
- sb.append("\ufecb");
- sb.append("\111");
- sb.append("\ufecb");
- sb.append("\114");
- sb.append("\ufecb");
- sb.append("\116");
- sb.append("\ufecb");
- sb.append("\145");
- sb.append("\ufecb");
- sb.append("\220");
- sb.append("\u0264");
- sb.append("\221");
- sb.append("\u0267");
- sb.append("\001");
- sb.append("\002");
- sb.append("\000");
- sb.append("\004");
- sb.append("\043");
- sb.append("\ufebd");
- sb.append("\001");
- sb.append("\002");
- sb.append("\000");
- sb.append("\004");
- sb.append("\043");
- sb.append("\ufebc");
- sb.append("\001");
- sb.append("\002");
- sb.append("\000");
- sb.append("\006");
- sb.append("\066");
- sb.append("\uff3a");
- sb.append("\106");
- sb.append("\uff3a");
- sb.append("\001");
- sb.append("\002");
- sb.append("\000");
- sb.append("\120");
- sb.append("\031");
- sb.append("\ufd97");
- sb.append("\033");
- sb.append("\ufd97");
- sb.append("\067");
- sb.append("\ufd97");
- sb.append("\070");
- sb.append("\ufd97");
- sb.append("\107");
- sb.append("\ufd97");
- sb.append("\124");
- sb.append("\ufd97");
- sb.append("\125");
- sb.append("\ufd97");
- sb.append("\126");
- sb.append("\ufd97");
- sb.append("\127");
- sb.append("\ufd97");
- sb.append("\145");
- sb.append("\ufd97");
- sb.append("\146");
- sb.append("\ufd97");
- sb.append("\147");
- sb.append("\ufd97");
- sb.append("\150");
- sb.append("\ufd97");
- sb.append("\151");
- sb.append("\ufd97");
- sb.append("\152");
- sb.append("\ufd97");
- sb.append("\153");
- sb.append("\ufd97");
- sb.append("\154");
- sb.append("\ufd97");
- sb.append("\155");
- sb.append("\ufd97");
- sb.append("\156");
- sb.append("\ufd97");
- sb.append("\157");
- sb.append("\ufd97");
- sb.append("\160");
- sb.append("\ufd97");
- sb.append("\161");
- sb.append("\ufd97");
- sb.append("\162");
- sb.append("\ufd97");
- sb.append("\163");
- sb.append("\ufd97");
- sb.append("\164");
- sb.append("\ufd97");
- sb.append("\165");
- sb.append("\ufd97");
- sb.append("\166");
- sb.append("\ufd97");
- sb.append("\167");
- sb.append("\ufd97");
- sb.append("\170");
- sb.append("\ufd97");
- sb.append("\171");
- sb.append("\ufd97");
- sb.append("\172");
- sb.append("\ufd97");
- sb.append("\173");
- sb.append("\ufd97");
- sb.append("\176");
- sb.append("\ufd97");
- sb.append("\212");
- sb.append("\ufd97");
- sb.append("\225");
- sb.append("\ufd97");
- sb.append("\226");
- sb.append("\ufd97");
- sb.append("\227");
- sb.append("\ufd97");
- sb.append("\237");
- sb.append("\ufd97");
- sb.append("\242");
- sb.append("\ufd97");
- sb.append("\001");
- sb.append("\002");
- sb.append("\000");
- sb.append("\124");
- sb.append("\031");
- sb.append("\ufd94");
- sb.append("\033");
- sb.append("\ufd94");
- sb.append("\067");
- sb.append("\ufd94");
- sb.append("\070");
- sb.append("\ufd94");
- sb.append("\106");
- sb.append("\u0112");
- sb.append("\107");
- sb.append("\ufd94");
sb.append("\124");
sb.append("\ufd94");
sb.append("\125");
@@ -349,7 +203,7 @@ public class EncodedActionTable5 {
sb.append("\033");
sb.append("\ufe34");
sb.append("\067");
- sb.append("\u02f0");
+ sb.append("\u02ef");
sb.append("\070");
sb.append("\ufe34");
sb.append("\107");
@@ -723,7 +577,7 @@ public class EncodedActionTable5 {
sb.append("\031");
sb.append("\257");
sb.append("\070");
- sb.append("\u0303");
+ sb.append("\u0302");
sb.append("\124");
sb.append("\ufd77");
sb.append("\125");
@@ -801,7 +655,7 @@ public class EncodedActionTable5 {
sb.append("\000");
sb.append("\010");
sb.append("\124");
- sb.append("\u0301");
+ sb.append("\u0300");
sb.append("\212");
sb.append("\ufd7d");
sb.append("\226");
@@ -821,13 +675,13 @@ public class EncodedActionTable5 {
sb.append("\000");
sb.append("\004");
sb.append("\212");
- sb.append("\u0300");
+ sb.append("\u02ff");
sb.append("\001");
sb.append("\002");
sb.append("\000");
sb.append("\004");
sb.append("\225");
- sb.append("\u02fb");
+ sb.append("\u02fa");
sb.append("\001");
sb.append("\002");
sb.append("\000");
@@ -857,7 +711,7 @@ public class EncodedActionTable5 {
sb.append("\061");
sb.append("\032");
sb.append("\071");
- sb.append("\u02fa");
+ sb.append("\u02f9");
sb.append("\072");
sb.append("\014");
sb.append("\074");
@@ -899,7 +753,7 @@ public class EncodedActionTable5 {
sb.append("\130");
sb.append("\074");
sb.append("\153");
- sb.append("\u02f4");
+ sb.append("\u02f3");
sb.append("\167");
sb.append("\124");
sb.append("\170");
@@ -951,7 +805,7 @@ public class EncodedActionTable5 {
sb.append("\000");
sb.append("\004");
sb.append("\226");
- sb.append("\u02fd");
+ sb.append("\u02fc");
sb.append("\001");
sb.append("\002");
sb.append("\000");
@@ -959,7 +813,7 @@ public class EncodedActionTable5 {
sb.append("\124");
sb.append("\ufd73");
sb.append("\131");
- sb.append("\u02fe");
+ sb.append("\u02fd");
sb.append("\212");
sb.append("\ufd73");
sb.append("\226");
@@ -1193,7 +1047,7 @@ public class EncodedActionTable5 {
sb.append("\061");
sb.append("\032");
sb.append("\071");
- sb.append("\u02fa");
+ sb.append("\u02f9");
sb.append("\072");
sb.append("\014");
sb.append("\074");
@@ -1235,7 +1089,7 @@ public class EncodedActionTable5 {
sb.append("\130");
sb.append("\074");
sb.append("\153");
- sb.append("\u02f4");
+ sb.append("\u02f3");
sb.append("\167");
sb.append("\124");
sb.append("\170");
@@ -1323,7 +1177,7 @@ public class EncodedActionTable5 {
sb.append("\061");
sb.append("\032");
sb.append("\071");
- sb.append("\u0306");
+ sb.append("\u0305");
sb.append("\072");
sb.append("\014");
sb.append("\074");
@@ -1363,7 +1217,7 @@ public class EncodedActionTable5 {
sb.append("\130");
sb.append("\074");
sb.append("\153");
- sb.append("\u0304");
+ sb.append("\u0303");
sb.append("\167");
sb.append("\124");
sb.append("\170");
@@ -1507,7 +1361,7 @@ public class EncodedActionTable5 {
sb.append("\000");
sb.append("\004");
sb.append("\225");
- sb.append("\u0307");
+ sb.append("\u0306");
sb.append("\001");
sb.append("\002");
sb.append("\000");
@@ -1537,7 +1391,7 @@ public class EncodedActionTable5 {
sb.append("\061");
sb.append("\032");
sb.append("\071");
- sb.append("\u02fa");
+ sb.append("\u02f9");
sb.append("\072");
sb.append("\014");
sb.append("\074");
@@ -1579,7 +1433,7 @@ public class EncodedActionTable5 {
sb.append("\130");
sb.append("\074");
sb.append("\153");
- sb.append("\u02f4");
+ sb.append("\u02f3");
sb.append("\167");
sb.append("\124");
sb.append("\170");
@@ -1631,7 +1485,7 @@ public class EncodedActionTable5 {
sb.append("\000");
sb.append("\004");
sb.append("\226");
- sb.append("\u0309");
+ sb.append("\u0308");
sb.append("\001");
sb.append("\002");
sb.append("\000");
@@ -1639,7 +1493,7 @@ public class EncodedActionTable5 {
sb.append("\124");
sb.append("\ufd74");
sb.append("\131");
- sb.append("\u02fe");
+ sb.append("\u02fd");
sb.append("\212");
sb.append("\ufd74");
sb.append("\226");
@@ -2839,7 +2693,7 @@ public class EncodedActionTable5 {
sb.append("\176");
sb.append("\241");
sb.append("\227");
- sb.append("\u031e");
+ sb.append("\u031d");
sb.append("\237");
sb.append("\240");
sb.append("\242");
@@ -3965,7 +3819,7 @@ public class EncodedActionTable5 {
sb.append("\176");
sb.append("\ufea3");
sb.append("\226");
- sb.append("\u032a");
+ sb.append("\u0329");
sb.append("\237");
sb.append("\ufea3");
sb.append("\242");
@@ -4415,7 +4269,7 @@ public class EncodedActionTable5 {
sb.append("\000");
sb.append("\004");
sb.append("\225");
- sb.append("\u032f");
+ sb.append("\u032e");
sb.append("\001");
sb.append("\002");
sb.append("\000");
@@ -4447,13 +4301,13 @@ public class EncodedActionTable5 {
sb.append("\000");
sb.append("\004");
sb.append("\226");
- sb.append("\u0331");
+ sb.append("\u0330");
sb.append("\001");
sb.append("\002");
sb.append("\000");
sb.append("\010");
sb.append("\054");
- sb.append("\u0332");
+ sb.append("\u0331");
sb.append("\106");
sb.append("\ufe57");
sb.append("\227");
@@ -4463,7 +4317,7 @@ public class EncodedActionTable5 {
sb.append("\000");
sb.append("\004");
sb.append("\225");
- sb.append("\u0338");
+ sb.append("\u0337");
sb.append("\001");
sb.append("\002");
sb.append("\000");
@@ -4477,7 +4331,7 @@ public class EncodedActionTable5 {
sb.append("\000");
sb.append("\004");
sb.append("\106");
- sb.append("\u0335");
+ sb.append("\u0334");
sb.append("\001");
sb.append("\002");
sb.append("\000");
@@ -4528,5 +4382,151 @@ public class EncodedActionTable5 {
sb.append("\uff8b");
sb.append("\043");
sb.append("\uff8b");
+ sb.append("\045");
+ sb.append("\uff8b");
+ sb.append("\046");
+ sb.append("\uff8b");
+ sb.append("\047");
+ sb.append("\uff8b");
+ sb.append("\050");
+ sb.append("\uff8b");
+ sb.append("\052");
+ sb.append("\uff8b");
+ sb.append("\054");
+ sb.append("\uff8b");
+ sb.append("\055");
+ sb.append("\uff8b");
+ sb.append("\057");
+ sb.append("\uff8b");
+ sb.append("\060");
+ sb.append("\uff8b");
+ sb.append("\061");
+ sb.append("\uff8b");
+ sb.append("\063");
+ sb.append("\uff8b");
+ sb.append("\064");
+ sb.append("\uff8b");
+ sb.append("\071");
+ sb.append("\uff8b");
+ sb.append("\072");
+ sb.append("\uff8b");
+ sb.append("\074");
+ sb.append("\uff8b");
+ sb.append("\075");
+ sb.append("\uff8b");
+ sb.append("\076");
+ sb.append("\uff8b");
+ sb.append("\077");
+ sb.append("\uff8b");
+ sb.append("\100");
+ sb.append("\uff8b");
+ sb.append("\101");
+ sb.append("\uff8b");
+ sb.append("\102");
+ sb.append("\uff8b");
+ sb.append("\106");
+ sb.append("\uff8b");
+ sb.append("\107");
+ sb.append("\uff8b");
+ sb.append("\111");
+ sb.append("\uff8b");
+ sb.append("\112");
+ sb.append("\uff8b");
+ sb.append("\113");
+ sb.append("\uff8b");
+ sb.append("\114");
+ sb.append("\uff8b");
+ sb.append("\115");
+ sb.append("\uff8b");
+ sb.append("\116");
+ sb.append("\uff8b");
+ sb.append("\117");
+ sb.append("\uff8b");
+ sb.append("\120");
+ sb.append("\uff8b");
+ sb.append("\121");
+ sb.append("\uff8b");
+ sb.append("\122");
+ sb.append("\uff8b");
+ sb.append("\123");
+ sb.append("\uff8b");
+ sb.append("\130");
+ sb.append("\uff8b");
+ sb.append("\146");
+ sb.append("\uff8b");
+ sb.append("\167");
+ sb.append("\uff8b");
+ sb.append("\170");
+ sb.append("\uff8b");
+ sb.append("\174");
+ sb.append("\uff8b");
+ sb.append("\175");
+ sb.append("\uff8b");
+ sb.append("\177");
+ sb.append("\uff8b");
+ sb.append("\200");
+ sb.append("\uff8b");
+ sb.append("\201");
+ sb.append("\uff8b");
+ sb.append("\202");
+ sb.append("\uff8b");
+ sb.append("\203");
+ sb.append("\uff8b");
+ sb.append("\204");
+ sb.append("\uff8b");
+ sb.append("\205");
+ sb.append("\uff8b");
+ sb.append("\206");
+ sb.append("\uff8b");
+ sb.append("\207");
+ sb.append("\uff8b");
+ sb.append("\210");
+ sb.append("\uff8b");
+ sb.append("\211");
+ sb.append("\uff8b");
+ sb.append("\213");
+ sb.append("\uff8b");
+ sb.append("\217");
+ sb.append("\uff8b");
+ sb.append("\220");
+ sb.append("\uff8b");
+ sb.append("\221");
+ sb.append("\uff8b");
+ sb.append("\225");
+ sb.append("\uff8b");
+ sb.append("\230");
+ sb.append("\uff8b");
+ sb.append("\231");
+ sb.append("\uff8b");
+ sb.append("\232");
+ sb.append("\uff8b");
+ sb.append("\233");
+ sb.append("\uff8b");
+ sb.append("\235");
+ sb.append("\uff8b");
+ sb.append("\001");
+ sb.append("\002");
+ sb.append("\000");
+ sb.append("\252");
+ sb.append("\003");
+ sb.append("\142");
+ sb.append("\004");
+ sb.append("\174");
+ sb.append("\005");
+ sb.append("\211");
+ sb.append("\006");
+ sb.append("\127");
+ sb.append("\007");
+ sb.append("\011");
+ sb.append("\010");
+ sb.append("\036");
+ sb.append("\011");
+ sb.append("\063");
+ sb.append("\012");
+ sb.append("\072");
+ sb.append("\014");
+ sb.append("\113");
+ sb.append("\015");
+ sb.append("\160");
}
}
\ 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 1af8e1d..e7baf2e 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,152 +28,6 @@ public class EncodedActionTable6 {
}
protected EncodedActionTable6() {
sb = new StringBuilder();
- sb.append("\045");
- sb.append("\uff8b");
- sb.append("\046");
- sb.append("\uff8b");
- sb.append("\047");
- sb.append("\uff8b");
- sb.append("\050");
- sb.append("\uff8b");
- sb.append("\052");
- sb.append("\uff8b");
- sb.append("\054");
- sb.append("\uff8b");
- sb.append("\055");
- sb.append("\uff8b");
- sb.append("\057");
- sb.append("\uff8b");
- sb.append("\060");
- sb.append("\uff8b");
- sb.append("\061");
- sb.append("\uff8b");
- sb.append("\063");
- sb.append("\uff8b");
- sb.append("\064");
- sb.append("\uff8b");
- sb.append("\071");
- sb.append("\uff8b");
- sb.append("\072");
- sb.append("\uff8b");
- sb.append("\074");
- sb.append("\uff8b");
- sb.append("\075");
- sb.append("\uff8b");
- sb.append("\076");
- sb.append("\uff8b");
- sb.append("\077");
- sb.append("\uff8b");
- sb.append("\100");
- sb.append("\uff8b");
- sb.append("\101");
- sb.append("\uff8b");
- sb.append("\102");
- sb.append("\uff8b");
- sb.append("\106");
- sb.append("\uff8b");
- sb.append("\107");
- sb.append("\uff8b");
- sb.append("\111");
- sb.append("\uff8b");
- sb.append("\112");
- sb.append("\uff8b");
- sb.append("\113");
- sb.append("\uff8b");
- sb.append("\114");
- sb.append("\uff8b");
- sb.append("\115");
- sb.append("\uff8b");
- sb.append("\116");
- sb.append("\uff8b");
- sb.append("\117");
- sb.append("\uff8b");
- sb.append("\120");
- sb.append("\uff8b");
- sb.append("\121");
- sb.append("\uff8b");
- sb.append("\122");
- sb.append("\uff8b");
- sb.append("\123");
- sb.append("\uff8b");
- sb.append("\130");
- sb.append("\uff8b");
- sb.append("\146");
- sb.append("\uff8b");
- sb.append("\167");
- sb.append("\uff8b");
- sb.append("\170");
- sb.append("\uff8b");
- sb.append("\174");
- sb.append("\uff8b");
- sb.append("\175");
- sb.append("\uff8b");
- sb.append("\177");
- sb.append("\uff8b");
- sb.append("\200");
- sb.append("\uff8b");
- sb.append("\201");
- sb.append("\uff8b");
- sb.append("\202");
- sb.append("\uff8b");
- sb.append("\203");
- sb.append("\uff8b");
- sb.append("\204");
- sb.append("\uff8b");
- sb.append("\205");
- sb.append("\uff8b");
- sb.append("\206");
- sb.append("\uff8b");
- sb.append("\207");
- sb.append("\uff8b");
- sb.append("\210");
- sb.append("\uff8b");
- sb.append("\211");
- sb.append("\uff8b");
- sb.append("\213");
- sb.append("\uff8b");
- sb.append("\217");
- sb.append("\uff8b");
- sb.append("\220");
- sb.append("\uff8b");
- sb.append("\221");
- sb.append("\uff8b");
- sb.append("\225");
- sb.append("\uff8b");
- sb.append("\230");
- sb.append("\uff8b");
- sb.append("\231");
- sb.append("\uff8b");
- sb.append("\232");
- sb.append("\uff8b");
- sb.append("\233");
- sb.append("\uff8b");
- sb.append("\235");
- sb.append("\uff8b");
- sb.append("\001");
- sb.append("\002");
- sb.append("\000");
- sb.append("\252");
- sb.append("\003");
- sb.append("\142");
- sb.append("\004");
- sb.append("\174");
- sb.append("\005");
- sb.append("\211");
- sb.append("\006");
- sb.append("\127");
- sb.append("\007");
- sb.append("\011");
- sb.append("\010");
- sb.append("\036");
- sb.append("\011");
- sb.append("\063");
- sb.append("\012");
- sb.append("\072");
- sb.append("\014");
- sb.append("\113");
- sb.append("\015");
- sb.append("\160");
sb.append("\016");
sb.append("\156");
sb.append("\017");
@@ -245,7 +99,7 @@ public class EncodedActionTable6 {
sb.append("\106");
sb.append("\075");
sb.append("\107");
- sb.append("\u0337");
+ sb.append("\u0336");
sb.append("\111");
sb.append("\216");
sb.append("\112");
@@ -405,23 +259,23 @@ public class EncodedActionTable6 {
sb.append("\000");
sb.append("\006");
sb.append("\012");
- sb.append("\u033b");
+ sb.append("\u033a");
sb.append("\153");
- sb.append("\u0339");
+ sb.append("\u0338");
sb.append("\001");
sb.append("\002");
sb.append("\000");
sb.append("\004");
sb.append("\012");
- sb.append("\u0341");
+ sb.append("\u0340");
sb.append("\001");
sb.append("\002");
sb.append("\000");
sb.append("\006");
sb.append("\124");
- sb.append("\u033d");
- sb.append("\226");
sb.append("\u033c");
+ sb.append("\226");
+ sb.append("\u033b");
sb.append("\001");
sb.append("\002");
sb.append("\000");
@@ -443,15 +297,15 @@ public class EncodedActionTable6 {
sb.append("\000");
sb.append("\006");
sb.append("\012");
- sb.append("\u033f");
- sb.append("\153");
sb.append("\u033e");
+ sb.append("\153");
+ sb.append("\u033d");
sb.append("\001");
sb.append("\002");
sb.append("\000");
sb.append("\004");
sb.append("\012");
- sb.append("\u0340");
+ sb.append("\u033f");
sb.append("\001");
sb.append("\002");
sb.append("\000");
@@ -585,7 +439,7 @@ public class EncodedActionTable6 {
sb.append("\000");
sb.append("\004");
sb.append("\225");
- sb.append("\u0346");
+ sb.append("\u0345");
sb.append("\001");
sb.append("\002");
sb.append("\000");
@@ -617,13 +471,13 @@ public class EncodedActionTable6 {
sb.append("\000");
sb.append("\004");
sb.append("\226");
- sb.append("\u0348");
+ sb.append("\u0347");
sb.append("\001");
sb.append("\002");
sb.append("\000");
sb.append("\010");
sb.append("\054");
- sb.append("\u0332");
+ sb.append("\u0331");
sb.append("\106");
sb.append("\ufe57");
sb.append("\227");
@@ -641,7 +495,7 @@ public class EncodedActionTable6 {
sb.append("\000");
sb.append("\004");
sb.append("\106");
- sb.append("\u034b");
+ sb.append("\u034a");
sb.append("\001");
sb.append("\002");
sb.append("\000");
@@ -909,7 +763,7 @@ public class EncodedActionTable6 {
sb.append("\106");
sb.append("\075");
sb.append("\107");
- sb.append("\u034d");
+ sb.append("\u034c");
sb.append("\111");
sb.append("\216");
sb.append("\112");
@@ -1299,7 +1153,7 @@ public class EncodedActionTable6 {
sb.append("\225");
sb.append("\203");
sb.append("\227");
- sb.append("\u0350");
+ sb.append("\u034f");
sb.append("\230");
sb.append("\120");
sb.append("\231");
@@ -1859,9 +1713,9 @@ public class EncodedActionTable6 {
sb.append("\214");
sb.append("\uff15");
sb.append("\215");
- sb.append("\u0355");
- sb.append("\216");
sb.append("\u0354");
+ sb.append("\216");
+ sb.append("\u0353");
sb.append("\217");
sb.append("\uff15");
sb.append("\220");
@@ -2243,7 +2097,7 @@ public class EncodedActionTable6 {
sb.append("\000");
sb.append("\004");
sb.append("\225");
- sb.append("\u0356");
+ sb.append("\u0355");
sb.append("\001");
sb.append("\002");
sb.append("\000");
@@ -2415,7 +2269,7 @@ public class EncodedActionTable6 {
sb.append("\176");
sb.append("\241");
sb.append("\226");
- sb.append("\u0358");
+ sb.append("\u0357");
sb.append("\237");
sb.append("\240");
sb.append("\242");
@@ -3159,27 +3013,27 @@ public class EncodedActionTable6 {
sb.append("\214");
sb.append("\uff13");
sb.append("\215");
- sb.append("\u035f");
- sb.append("\216");
sb.append("\u035e");
+ sb.append("\216");
+ sb.append("\u035d");
sb.append("\001");
sb.append("\002");
sb.append("\000");
sb.append("\004");
sb.append("\214");
- sb.append("\u0367");
+ sb.append("\u0366");
sb.append("\001");
sb.append("\002");
sb.append("\000");
sb.append("\004");
sb.append("\227");
- sb.append("\u0365");
+ sb.append("\u0364");
sb.append("\001");
sb.append("\002");
sb.append("\000");
sb.append("\004");
sb.append("\225");
- sb.append("\u0360");
+ sb.append("\u035f");
sb.append("\001");
sb.append("\002");
sb.append("\000");
@@ -3351,7 +3205,7 @@ public class EncodedActionTable6 {
sb.append("\176");
sb.append("\241");
sb.append("\226");
- sb.append("\u0362");
+ sb.append("\u0361");
sb.append("\237");
sb.append("\240");
sb.append("\242");
@@ -3361,7 +3215,7 @@ public class EncodedActionTable6 {
sb.append("\000");
sb.append("\004");
sb.append("\227");
- sb.append("\u0363");
+ sb.append("\u0362");
sb.append("\001");
sb.append("\002");
sb.append("\000");
@@ -4063,7 +3917,7 @@ public class EncodedActionTable6 {
sb.append("\000");
sb.append("\004");
sb.append("\146");
- sb.append("\u0368");
+ sb.append("\u0367");
sb.append("\001");
sb.append("\002");
sb.append("\000");
@@ -4275,15 +4129,15 @@ public class EncodedActionTable6 {
sb.append("\000");
sb.append("\006");
sb.append("\124");
- sb.append("\u036f");
- sb.append("\226");
sb.append("\u036e");
+ sb.append("\226");
+ sb.append("\u036d");
sb.append("\001");
sb.append("\002");
sb.append("\000");
sb.append("\004");
sb.append("\131");
- sb.append("\u036c");
+ sb.append("\u036b");
sb.append("\001");
sb.append("\002");
sb.append("\000");
@@ -4501,7 +4355,7 @@ public class EncodedActionTable6 {
sb.append("\225");
sb.append("\203");
sb.append("\227");
- sb.append("\u0374");
+ sb.append("\u0373");
sb.append("\230");
sb.append("\120");
sb.append("\231");
@@ -4523,10 +4377,156 @@ public class EncodedActionTable6 {
sb.append("\000");
sb.append("\004");
sb.append("\131");
- sb.append("\u0371");
+ sb.append("\u0370");
sb.append("\001");
sb.append("\002");
sb.append("\000");
sb.append("\066");
+ sb.append("\006");
+ sb.append("\127");
+ sb.append("\007");
+ sb.append("\011");
+ sb.append("\010");
+ sb.append("\u0199");
+ sb.append("\015");
+ sb.append("\u019f");
+ sb.append("\016");
+ sb.append("\u019a");
+ sb.append("\072");
+ sb.append("\u0193");
+ sb.append("\074");
+ sb.append("\021");
+ sb.append("\075");
+ sb.append("\141");
+ sb.append("\076");
+ sb.append("\053");
+ sb.append("\077");
+ sb.append("\055");
+ sb.append("\100");
+ sb.append("\161");
+ sb.append("\101");
+ sb.append("\006");
+ sb.append("\102");
+ sb.append("\037");
+ sb.append("\111");
+ sb.append("\u0195");
+ sb.append("\112");
+ sb.append("\155");
+ sb.append("\113");
+ sb.append("\043");
+ sb.append("\114");
+ sb.append("\u018f");
+ sb.append("\116");
+ sb.append("\065");
+ sb.append("\167");
+ sb.append("\u019d");
+ sb.append("\170");
+ sb.append("\u0194");
+ sb.append("\174");
+ sb.append("\u0191");
+ sb.append("\175");
+ sb.append("\u0197");
+ sb.append("\211");
+ sb.append("\u019b");
+ sb.append("\217");
+ sb.append("\311");
+ sb.append("\225");
+ sb.append("\u01a2");
+ sb.append("\233");
+ sb.append("\143");
+ sb.append("\001");
+ sb.append("\002");
+ sb.append("\000");
+ sb.append("\006");
+ sb.append("\124");
+ sb.append("\uff25");
+ sb.append("\226");
+ sb.append("\uff25");
+ sb.append("\001");
+ sb.append("\002");
+ sb.append("\000");
+ sb.append("\304");
+ sb.append("\002");
+ sb.append("\uff6d");
+ sb.append("\003");
+ sb.append("\uff6d");
+ sb.append("\004");
+ sb.append("\uff6d");
+ sb.append("\005");
+ sb.append("\uff6d");
+ sb.append("\006");
+ sb.append("\uff6d");
+ sb.append("\007");
+ sb.append("\uff6d");
+ sb.append("\010");
+ sb.append("\uff6d");
+ sb.append("\011");
+ sb.append("\uff6d");
+ sb.append("\012");
+ sb.append("\uff6d");
+ sb.append("\014");
+ sb.append("\uff6d");
+ sb.append("\015");
+ sb.append("\uff6d");
+ sb.append("\016");
+ sb.append("\uff6d");
+ sb.append("\017");
+ sb.append("\uff6d");
+ sb.append("\020");
+ sb.append("\uff6d");
+ sb.append("\021");
+ sb.append("\uff6d");
+ sb.append("\022");
+ sb.append("\uff6d");
+ sb.append("\023");
+ sb.append("\uff6d");
+ sb.append("\024");
+ sb.append("\uff6d");
+ sb.append("\025");
+ sb.append("\uff6d");
+ sb.append("\026");
+ sb.append("\uff6d");
+ sb.append("\027");
+ sb.append("\uff6d");
+ sb.append("\030");
+ sb.append("\uff6d");
+ sb.append("\032");
+ sb.append("\uff6d");
+ sb.append("\034");
+ sb.append("\uff6d");
+ sb.append("\035");
+ sb.append("\uff6d");
+ sb.append("\036");
+ sb.append("\uff6d");
+ sb.append("\037");
+ sb.append("\uff6d");
+ sb.append("\040");
+ sb.append("\uff6d");
+ sb.append("\041");
+ sb.append("\uff6d");
+ sb.append("\042");
+ sb.append("\uff6d");
+ sb.append("\043");
+ sb.append("\uff6d");
+ sb.append("\044");
+ sb.append("\uff6d");
+ sb.append("\045");
+ sb.append("\uff6d");
+ sb.append("\046");
+ sb.append("\uff6d");
+ sb.append("\047");
+ sb.append("\uff6d");
+ sb.append("\050");
+ sb.append("\uff6d");
+ sb.append("\052");
+ sb.append("\uff6d");
+ sb.append("\054");
+ sb.append("\uff6d");
+ sb.append("\055");
+ sb.append("\uff6d");
+ sb.append("\057");
+ sb.append("\uff6d");
+ sb.append("\060");
+ sb.append("\uff6d");
}
}
\ 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 d4e08aa..bb41cf2 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,152 +28,6 @@ public class EncodedActionTable7 {
}
protected EncodedActionTable7() {
sb = new StringBuilder();
- sb.append("\006");
- sb.append("\127");
- sb.append("\007");
- sb.append("\011");
- sb.append("\010");
- sb.append("\u0199");
- sb.append("\015");
- sb.append("\u019f");
- sb.append("\016");
- sb.append("\u019a");
- sb.append("\072");
- sb.append("\u0193");
- sb.append("\074");
- sb.append("\021");
- sb.append("\075");
- sb.append("\141");
- sb.append("\076");
- sb.append("\053");
- sb.append("\077");
- sb.append("\055");
- sb.append("\100");
- sb.append("\161");
- sb.append("\101");
- sb.append("\006");
- sb.append("\102");
- sb.append("\037");
- sb.append("\111");
- sb.append("\u0195");
- sb.append("\112");
- sb.append("\155");
- sb.append("\113");
- sb.append("\043");
- sb.append("\114");
- sb.append("\u018f");
- sb.append("\116");
- sb.append("\065");
- sb.append("\167");
- sb.append("\u019d");
- sb.append("\170");
- sb.append("\u0194");
- sb.append("\174");
- sb.append("\u0191");
- sb.append("\175");
- sb.append("\u0197");
- sb.append("\211");
- sb.append("\u019b");
- sb.append("\217");
- sb.append("\311");
- sb.append("\225");
- sb.append("\u01a2");
- sb.append("\233");
- sb.append("\143");
- sb.append("\001");
- sb.append("\002");
- sb.append("\000");
- sb.append("\006");
- sb.append("\124");
- sb.append("\uff25");
- sb.append("\226");
- sb.append("\uff25");
- sb.append("\001");
- sb.append("\002");
- sb.append("\000");
- sb.append("\304");
- sb.append("\002");
- sb.append("\uff6d");
- sb.append("\003");
- sb.append("\uff6d");
- sb.append("\004");
- sb.append("\uff6d");
- sb.append("\005");
- sb.append("\uff6d");
- sb.append("\006");
- sb.append("\uff6d");
- sb.append("\007");
- sb.append("\uff6d");
- sb.append("\010");
- sb.append("\uff6d");
- sb.append("\011");
- sb.append("\uff6d");
- sb.append("\012");
- sb.append("\uff6d");
- sb.append("\014");
- sb.append("\uff6d");
- sb.append("\015");
- sb.append("\uff6d");
- sb.append("\016");
- sb.append("\uff6d");
- sb.append("\017");
- sb.append("\uff6d");
- sb.append("\020");
- sb.append("\uff6d");
- sb.append("\021");
- sb.append("\uff6d");
- sb.append("\022");
- sb.append("\uff6d");
- sb.append("\023");
- sb.append("\uff6d");
- sb.append("\024");
- sb.append("\uff6d");
- sb.append("\025");
- sb.append("\uff6d");
- sb.append("\026");
- sb.append("\uff6d");
- sb.append("\027");
- sb.append("\uff6d");
- sb.append("\030");
- sb.append("\uff6d");
- sb.append("\032");
- sb.append("\uff6d");
- sb.append("\034");
- sb.append("\uff6d");
- sb.append("\035");
- sb.append("\uff6d");
- sb.append("\036");
- sb.append("\uff6d");
- sb.append("\037");
- sb.append("\uff6d");
- sb.append("\040");
- sb.append("\uff6d");
- sb.append("\041");
- sb.append("\uff6d");
- sb.append("\042");
- sb.append("\uff6d");
- sb.append("\043");
- sb.append("\uff6d");
- sb.append("\044");
- sb.append("\uff6d");
- sb.append("\045");
- sb.append("\uff6d");
- sb.append("\046");
- sb.append("\uff6d");
- sb.append("\047");
- sb.append("\uff6d");
- sb.append("\050");
- sb.append("\uff6d");
- sb.append("\052");
- sb.append("\uff6d");
- sb.append("\054");
- sb.append("\uff6d");
- sb.append("\055");
- sb.append("\uff6d");
- sb.append("\057");
- sb.append("\uff6d");
- sb.append("\060");
- sb.append("\uff6d");
sb.append("\061");
sb.append("\uff6d");
sb.append("\062");
@@ -695,7 +549,7 @@ public class EncodedActionTable7 {
sb.append("\027");
sb.append("\210");
sb.append("\030");
- sb.append("\u0377");
+ sb.append("\u0376");
sb.append("\032");
sb.append("\123");
sb.append("\034");
@@ -833,7 +687,7 @@ public class EncodedActionTable7 {
sb.append("\000");
sb.append("\004");
sb.append("\146");
- sb.append("\u0378");
+ sb.append("\u0377");
sb.append("\001");
sb.append("\002");
sb.append("\000");
@@ -1047,7 +901,7 @@ public class EncodedActionTable7 {
sb.append("\145");
sb.append("\242");
sb.append("\146");
- sb.append("\u037a");
+ sb.append("\u0379");
sb.append("\147");
sb.append("\235");
sb.append("\150");
@@ -1455,13 +1309,13 @@ public class EncodedActionTable7 {
sb.append("\000");
sb.append("\004");
sb.append("\226");
- sb.append("\u0380");
+ sb.append("\u037f");
sb.append("\001");
sb.append("\002");
sb.append("\000");
sb.append("\004");
sb.append("\226");
- sb.append("\u037f");
+ sb.append("\u037e");
sb.append("\001");
sb.append("\002");
sb.append("\000");
@@ -1647,7 +1501,7 @@ public class EncodedActionTable7 {
sb.append("\061");
sb.append("\032");
sb.append("\071");
- sb.append("\u02fa");
+ sb.append("\u02f9");
sb.append("\072");
sb.append("\014");
sb.append("\074");
@@ -1689,7 +1543,7 @@ public class EncodedActionTable7 {
sb.append("\130");
sb.append("\074");
sb.append("\153");
- sb.append("\u02f4");
+ sb.append("\u02f3");
sb.append("\167");
sb.append("\124");
sb.append("\170");
@@ -1741,13 +1595,13 @@ public class EncodedActionTable7 {
sb.append("\000");
sb.append("\004");
sb.append("\226");
- sb.append("\u0383");
+ sb.append("\u0382");
sb.append("\001");
sb.append("\002");
sb.append("\000");
sb.append("\004");
sb.append("\131");
- sb.append("\u02fe");
+ sb.append("\u02fd");
sb.append("\001");
sb.append("\002");
sb.append("\000");
@@ -1759,13 +1613,13 @@ public class EncodedActionTable7 {
sb.append("\015");
sb.append("\160");
sb.append("\016");
- sb.append("\u038a");
+ sb.append("\u0389");
sb.append("\072");
sb.append("\014");
sb.append("\111");
- sb.append("\u0388");
+ sb.append("\u0387");
sb.append("\114");
- sb.append("\u0386");
+ sb.append("\u0385");
sb.append("\116");
sb.append("\065");
sb.append("\211");
@@ -1781,7 +1635,7 @@ public class EncodedActionTable7 {
sb.append("\000");
sb.append("\004");
sb.append("\110");
- sb.append("\u03a2");
+ sb.append("\u03a1");
sb.append("\001");
sb.append("\002");
sb.append("\000");
@@ -1803,7 +1657,7 @@ public class EncodedActionTable7 {
sb.append("\000");
sb.append("\004");
sb.append("\114");
- sb.append("\u039f");
+ sb.append("\u039e");
sb.append("\001");
sb.append("\002");
sb.append("\000");
@@ -1835,13 +1689,13 @@ public class EncodedActionTable7 {
sb.append("\000");
sb.append("\004");
sb.append("\110");
- sb.append("\u0393");
+ sb.append("\u0392");
sb.append("\001");
sb.append("\002");
sb.append("\000");
sb.append("\006");
sb.append("\124");
- sb.append("\u038f");
+ sb.append("\u038e");
sb.append("\226");
sb.append("\ufdd7");
sb.append("\001");
@@ -1869,13 +1723,13 @@ public class EncodedActionTable7 {
sb.append("\015");
sb.append("\160");
sb.append("\016");
- sb.append("\u038a");
+ sb.append("\u0389");
sb.append("\072");
sb.append("\014");
sb.append("\111");
- sb.append("\u0388");
+ sb.append("\u0387");
sb.append("\114");
- sb.append("\u0386");
+ sb.append("\u0385");
sb.append("\116");
sb.append("\065");
sb.append("\211");
@@ -1893,7 +1747,7 @@ public class EncodedActionTable7 {
sb.append("\000");
sb.append("\004");
sb.append("\226");
- sb.append("\u0391");
+ sb.append("\u0390");
sb.append("\001");
sb.append("\002");
sb.append("\000");
@@ -1989,7 +1843,7 @@ public class EncodedActionTable7 {
sb.append("\005");
sb.append("\u0189");
sb.append("\010");
- sb.append("\u0394");
+ sb.append("\u0393");
sb.append("\012");
sb.append("\072");
sb.append("\017");
@@ -2089,15 +1943,15 @@ public class EncodedActionTable7 {
sb.append("\106");
sb.append("\u0233");
sb.append("\111");
- sb.append("\u0397");
+ sb.append("\u0396");
sb.append("\112");
sb.append("\u0176");
sb.append("\113");
sb.append("\u014c");
sb.append("\114");
- sb.append("\u0396");
- sb.append("\116");
sb.append("\u0395");
+ sb.append("\116");
+ sb.append("\u0394");
sb.append("\117");
sb.append("\u0145");
sb.append("\120");
@@ -2179,7 +2033,7 @@ public class EncodedActionTable7 {
sb.append("\000");
sb.append("\006");
sb.append("\114");
- sb.append("\u039b");
+ sb.append("\u039a");
sb.append("\225");
sb.append("\uffc2");
sb.append("\001");
@@ -2437,7 +2291,7 @@ public class EncodedActionTable7 {
sb.append("\005");
sb.append("\u0189");
sb.append("\010");
- sb.append("\u0394");
+ sb.append("\u0393");
sb.append("\012");
sb.append("\072");
sb.append("\017");
@@ -2537,15 +2391,15 @@ public class EncodedActionTable7 {
sb.append("\106");
sb.append("\u021f");
sb.append("\111");
- sb.append("\u0397");
+ sb.append("\u0396");
sb.append("\112");
sb.append("\u0176");
sb.append("\113");
sb.append("\u014c");
sb.append("\114");
- sb.append("\u0396");
- sb.append("\116");
sb.append("\u0395");
+ sb.append("\116");
+ sb.append("\u0394");
sb.append("\117");
sb.append("\u0145");
sb.append("\120");
@@ -2785,7 +2639,7 @@ public class EncodedActionTable7 {
sb.append("\225");
sb.append("\220");
sb.append("\226");
- sb.append("\u03a8");
+ sb.append("\u03a7");
sb.append("\230");
sb.append("\120");
sb.append("\231");
@@ -2931,7 +2785,7 @@ public class EncodedActionTable7 {
sb.append("\176");
sb.append("\241");
sb.append("\226");
- sb.append("\u03a9");
+ sb.append("\u03a8");
sb.append("\237");
sb.append("\240");
sb.append("\242");
@@ -3737,7 +3591,7 @@ public class EncodedActionTable7 {
sb.append("\145");
sb.append("\ufdc1");
sb.append("\146");
- sb.append("\u03b5");
+ sb.append("\u03b4");
sb.append("\147");
sb.append("\ufdc1");
sb.append("\150");
@@ -3809,7 +3663,7 @@ public class EncodedActionTable7 {
sb.append("\145");
sb.append("\ufdc5");
sb.append("\146");
- sb.append("\u03b4");
+ sb.append("\u03b3");
sb.append("\147");
sb.append("\ufdc5");
sb.append("\150");
@@ -3863,7 +3717,7 @@ public class EncodedActionTable7 {
sb.append("\000");
sb.append("\004");
sb.append("\146");
- sb.append("\u03b3");
+ sb.append("\u03b2");
sb.append("\001");
sb.append("\002");
sb.append("\000");
@@ -3969,7 +3823,7 @@ public class EncodedActionTable7 {
sb.append("\217");
sb.append("\215");
sb.append("\225");
- sb.append("\u03b2");
+ sb.append("\u03b1");
sb.append("\230");
sb.append("\120");
sb.append("\231");
@@ -4528,5 +4382,151 @@ public class EncodedActionTable7 {
sb.append("\uff78");
sb.append("\200");
sb.append("\uff78");
+ sb.append("\201");
+ sb.append("\uff78");
+ sb.append("\202");
+ sb.append("\uff78");
+ sb.append("\203");
+ sb.append("\uff78");
+ sb.append("\204");
+ sb.append("\uff78");
+ sb.append("\205");
+ sb.append("\uff78");
+ sb.append("\206");
+ sb.append("\uff78");
+ sb.append("\207");
+ sb.append("\uff78");
+ sb.append("\210");
+ sb.append("\uff78");
+ sb.append("\211");
+ sb.append("\uff78");
+ sb.append("\213");
+ sb.append("\uff78");
+ sb.append("\214");
+ sb.append("\uff78");
+ sb.append("\215");
+ sb.append("\uff78");
+ sb.append("\216");
+ sb.append("\uff78");
+ sb.append("\217");
+ sb.append("\uff78");
+ sb.append("\220");
+ sb.append("\uff78");
+ sb.append("\221");
+ sb.append("\uff78");
+ sb.append("\225");
+ sb.append("\uff78");
+ sb.append("\230");
+ sb.append("\uff78");
+ sb.append("\231");
+ sb.append("\uff78");
+ sb.append("\232");
+ sb.append("\uff78");
+ sb.append("\233");
+ sb.append("\uff78");
+ sb.append("\235");
+ sb.append("\uff78");
+ sb.append("\001");
+ sb.append("\002");
+ sb.append("\000");
+ sb.append("\004");
+ sb.append("\131");
+ sb.append("\u03b6");
+ sb.append("\001");
+ sb.append("\002");
+ sb.append("\000");
+ sb.append("\066");
+ sb.append("\006");
+ sb.append("\127");
+ sb.append("\007");
+ sb.append("\011");
+ sb.append("\010");
+ sb.append("\u0199");
+ sb.append("\015");
+ sb.append("\u019f");
+ sb.append("\016");
+ sb.append("\u019a");
+ sb.append("\072");
+ sb.append("\u0193");
+ sb.append("\074");
+ sb.append("\021");
+ sb.append("\075");
+ sb.append("\141");
+ sb.append("\076");
+ sb.append("\053");
+ sb.append("\077");
+ sb.append("\055");
+ sb.append("\100");
+ sb.append("\161");
+ sb.append("\101");
+ sb.append("\006");
+ sb.append("\102");
+ sb.append("\037");
+ sb.append("\111");
+ sb.append("\u0195");
+ sb.append("\112");
+ sb.append("\155");
+ sb.append("\113");
+ sb.append("\043");
+ sb.append("\114");
+ sb.append("\u018f");
+ sb.append("\116");
+ sb.append("\065");
+ sb.append("\167");
+ sb.append("\u019d");
+ sb.append("\170");
+ sb.append("\u0194");
+ sb.append("\174");
+ sb.append("\u0191");
+ sb.append("\175");
+ sb.append("\u0197");
+ sb.append("\211");
+ sb.append("\u019b");
+ sb.append("\217");
+ sb.append("\311");
+ sb.append("\225");
+ sb.append("\u01a2");
+ sb.append("\233");
+ sb.append("\143");
+ sb.append("\001");
+ sb.append("\002");
+ sb.append("\000");
+ sb.append("\076");
+ sb.append("\124");
+ sb.append("\ufeae");
+ sb.append("\125");
+ sb.append("\u01b0");
+ sb.append("\126");
+ sb.append("\u01bf");
+ sb.append("\127");
+ sb.append("\u01a8");
+ sb.append("\145");
+ sb.append("\u01ac");
+ sb.append("\146");
+ sb.append("\ufeae");
+ sb.append("\147");
+ sb.append("\u01a7");
+ sb.append("\150");
+ sb.append("\u01b9");
+ sb.append("\151");
+ sb.append("\u01a9");
+ sb.append("\152");
+ sb.append("\u01b2");
+ sb.append("\153");
+ sb.append("\u01ba");
+ sb.append("\154");
+ sb.append("\u01be");
+ sb.append("\155");
+ sb.append("\u01b4");
+ sb.append("\156");
+ sb.append("\u01a4");
+ sb.append("\157");
+ sb.append("\u01b1");
+ sb.append("\160");
+ sb.append("\u01bd");
+ sb.append("\161");
+ sb.append("\u01bb");
+ sb.append("\162");
+ sb.append("\u01af");
}
}
\ 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 1be1e88..42111d2 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,152 +28,6 @@ public class EncodedActionTable8 {
}
protected EncodedActionTable8() {
sb = new StringBuilder();
- sb.append("\201");
- sb.append("\uff78");
- sb.append("\202");
- sb.append("\uff78");
- sb.append("\203");
- sb.append("\uff78");
- sb.append("\204");
- sb.append("\uff78");
- sb.append("\205");
- sb.append("\uff78");
- sb.append("\206");
- sb.append("\uff78");
- sb.append("\207");
- sb.append("\uff78");
- sb.append("\210");
- sb.append("\uff78");
- sb.append("\211");
- sb.append("\uff78");
- sb.append("\213");
- sb.append("\uff78");
- sb.append("\214");
- sb.append("\uff78");
- sb.append("\215");
- sb.append("\uff78");
- sb.append("\216");
- sb.append("\uff78");
- sb.append("\217");
- sb.append("\uff78");
- sb.append("\220");
- sb.append("\uff78");
- sb.append("\221");
- sb.append("\uff78");
- sb.append("\225");
- sb.append("\uff78");
- sb.append("\230");
- sb.append("\uff78");
- sb.append("\231");
- sb.append("\uff78");
- sb.append("\232");
- sb.append("\uff78");
- sb.append("\233");
- sb.append("\uff78");
- sb.append("\235");
- sb.append("\uff78");
- sb.append("\001");
- sb.append("\002");
- sb.append("\000");
- sb.append("\004");
- sb.append("\131");
- sb.append("\u03b7");
- sb.append("\001");
- sb.append("\002");
- sb.append("\000");
- sb.append("\066");
- sb.append("\006");
- sb.append("\127");
- sb.append("\007");
- sb.append("\011");
- sb.append("\010");
- sb.append("\u0199");
- sb.append("\015");
- sb.append("\u019f");
- sb.append("\016");
- sb.append("\u019a");
- sb.append("\072");
- sb.append("\u0193");
- sb.append("\074");
- sb.append("\021");
- sb.append("\075");
- sb.append("\141");
- sb.append("\076");
- sb.append("\053");
- sb.append("\077");
- sb.append("\055");
- sb.append("\100");
- sb.append("\161");
- sb.append("\101");
- sb.append("\006");
- sb.append("\102");
- sb.append("\037");
- sb.append("\111");
- sb.append("\u0195");
- sb.append("\112");
- sb.append("\155");
- sb.append("\113");
- sb.append("\043");
- sb.append("\114");
- sb.append("\u018f");
- sb.append("\116");
- sb.append("\065");
- sb.append("\167");
- sb.append("\u019d");
- sb.append("\170");
- sb.append("\u0194");
- sb.append("\174");
- sb.append("\u0191");
- sb.append("\175");
- sb.append("\u0197");
- sb.append("\211");
- sb.append("\u019b");
- sb.append("\217");
- sb.append("\311");
- sb.append("\225");
- sb.append("\u01a2");
- sb.append("\233");
- sb.append("\143");
- sb.append("\001");
- sb.append("\002");
- sb.append("\000");
- sb.append("\076");
- sb.append("\124");
- sb.append("\ufeae");
- sb.append("\125");
- sb.append("\u01b0");
- sb.append("\126");
- sb.append("\u01bf");
- sb.append("\127");
- sb.append("\u01a8");
- sb.append("\145");
- sb.append("\u01ac");
- sb.append("\146");
- sb.append("\ufeae");
- sb.append("\147");
- sb.append("\u01a7");
- sb.append("\150");
- sb.append("\u01b9");
- sb.append("\151");
- sb.append("\u01a9");
- sb.append("\152");
- sb.append("\u01b2");
- sb.append("\153");
- sb.append("\u01ba");
- sb.append("\154");
- sb.append("\u01be");
- sb.append("\155");
- sb.append("\u01b4");
- sb.append("\156");
- sb.append("\u01a4");
- sb.append("\157");
- sb.append("\u01b1");
- sb.append("\160");
- sb.append("\u01bd");
- sb.append("\161");
- sb.append("\u01bb");
- sb.append("\162");
- sb.append("\u01af");
sb.append("\163");
sb.append("\u01ad");
sb.append("\164");
@@ -603,7 +457,7 @@ public class EncodedActionTable8 {
sb.append("\176");
sb.append("\241");
sb.append("\226");
- sb.append("\u03be");
+ sb.append("\u03bd");
sb.append("\237");
sb.append("\240");
sb.append("\242");
@@ -613,9 +467,9 @@ public class EncodedActionTable8 {
sb.append("\000");
sb.append("\006");
sb.append("\106");
- sb.append("\u03c0");
+ sb.append("\u03bf");
sb.append("\227");
- sb.append("\u03c1");
+ sb.append("\u03c0");
sb.append("\001");
sb.append("\002");
sb.append("\000");
@@ -825,7 +679,7 @@ public class EncodedActionTable8 {
sb.append("\107");
sb.append("\uff20");
sb.append("\146");
- sb.append("\u03d3");
+ sb.append("\u03d2");
sb.append("\001");
sb.append("\002");
sb.append("\000");
@@ -837,17 +691,17 @@ public class EncodedActionTable8 {
sb.append("\037");
sb.append("\uff20");
sb.append("\146");
- sb.append("\u03c3");
+ sb.append("\u03c2");
sb.append("\001");
sb.append("\002");
sb.append("\000");
sb.append("\010");
sb.append("\035");
- sb.append("\u03d0");
+ sb.append("\u03cf");
sb.append("\036");
- sb.append("\u03c6");
+ sb.append("\u03c5");
sb.append("\037");
- sb.append("\u03c7");
+ sb.append("\u03c6");
sb.append("\001");
sb.append("\002");
sb.append("\000");
@@ -863,17 +717,17 @@ public class EncodedActionTable8 {
sb.append("\000");
sb.append("\010");
sb.append("\035");
- sb.append("\u03c5");
+ sb.append("\u03c4");
sb.append("\036");
- sb.append("\u03c6");
+ sb.append("\u03c5");
sb.append("\037");
- sb.append("\u03c7");
+ sb.append("\u03c6");
sb.append("\001");
sb.append("\002");
sb.append("\000");
sb.append("\004");
sb.append("\146");
- sb.append("\u03cf");
+ sb.append("\u03ce");
sb.append("\001");
sb.append("\002");
sb.append("\000");
@@ -991,9 +845,9 @@ public class EncodedActionTable8 {
sb.append("\000");
sb.append("\006");
sb.append("\146");
- sb.append("\u03c9");
+ sb.append("\u03c8");
sb.append("\227");
- sb.append("\u03ca");
+ sb.append("\u03c9");
sb.append("\001");
sb.append("\002");
sb.append("\000");
@@ -1721,7 +1575,7 @@ public class EncodedActionTable8 {
sb.append("\145");
sb.append("\242");
sb.append("\146");
- sb.append("\u03c9");
+ sb.append("\u03c8");
sb.append("\147");
sb.append("\235");
sb.append("\150");
@@ -1767,7 +1621,7 @@ public class EncodedActionTable8 {
sb.append("\176");
sb.append("\241");
sb.append("\227");
- sb.append("\u03ca");
+ sb.append("\u03c9");
sb.append("\237");
sb.append("\240");
sb.append("\242");
@@ -2331,7 +2185,7 @@ public class EncodedActionTable8 {
sb.append("\000");
sb.append("\004");
sb.append("\146");
- sb.append("\u03d1");
+ sb.append("\u03d0");
sb.append("\001");
sb.append("\002");
sb.append("\000");
@@ -2535,11 +2389,11 @@ public class EncodedActionTable8 {
sb.append("\000");
sb.append("\010");
sb.append("\036");
- sb.append("\u03c6");
+ sb.append("\u03c5");
sb.append("\037");
- sb.append("\u03c7");
+ sb.append("\u03c6");
sb.append("\107");
- sb.append("\u03d6");
+ sb.append("\u03d5");
sb.append("\001");
sb.append("\002");
sb.append("\000");
@@ -2555,11 +2409,11 @@ public class EncodedActionTable8 {
sb.append("\000");
sb.append("\010");
sb.append("\036");
- sb.append("\u03c6");
+ sb.append("\u03c5");
sb.append("\037");
- sb.append("\u03c7");
+ sb.append("\u03c6");
sb.append("\107");
- sb.append("\u03d5");
+ sb.append("\u03d4");
sb.append("\001");
sb.append("\002");
sb.append("\000");
@@ -3079,7 +2933,7 @@ public class EncodedActionTable8 {
sb.append("\000");
sb.append("\004");
sb.append("\226");
- sb.append("\u03d9");
+ sb.append("\u03d8");
sb.append("\001");
sb.append("\002");
sb.append("\000");
@@ -3427,9 +3281,9 @@ public class EncodedActionTable8 {
sb.append("\000");
sb.append("\006");
sb.append("\124");
- sb.append("\u03de");
+ sb.append("\u03dd");
sb.append("\146");
- sb.append("\u03df");
+ sb.append("\u03de");
sb.append("\001");
sb.append("\002");
sb.append("\000");
@@ -4019,7 +3873,7 @@ public class EncodedActionTable8 {
sb.append("\145");
sb.append("\242");
sb.append("\146");
- sb.append("\u03e3");
+ sb.append("\u03e2");
sb.append("\147");
sb.append("\235");
sb.append("\150");
@@ -4271,7 +4125,7 @@ public class EncodedActionTable8 {
sb.append("\000");
sb.append("\004");
sb.append("\106");
- sb.append("\u03e5");
+ sb.append("\u03e4");
sb.append("\001");
sb.append("\002");
sb.append("\000");
@@ -4305,13 +4159,13 @@ public class EncodedActionTable8 {
sb.append("\043");
sb.append("\ufec9");
sb.append("\054");
- sb.append("\u03e8");
+ sb.append("\u03e7");
sb.append("\056");
sb.append("\u025f");
sb.append("\107");
- sb.append("\u03e9");
+ sb.append("\u03e8");
sb.append("\115");
- sb.append("\u03ed");
+ sb.append("\u03ec");
sb.append("\217");
sb.append("\u0263");
sb.append("\220");
@@ -4327,25 +4181,11 @@ public class EncodedActionTable8 {
sb.append("\001");
sb.append("\002");
sb.append("\000");
- sb.append("\032");
- sb.append("\010");
- sb.append("\ufece");
+ sb.append("\014");
sb.append("\012");
sb.append("\ufece");
sb.append("\043");
sb.append("\ufec6");
- sb.append("\072");
- sb.append("\ufece");
- sb.append("\073");
- sb.append("\ufece");
- sb.append("\111");
- sb.append("\ufece");
- sb.append("\114");
- sb.append("\ufece");
- sb.append("\116");
- sb.append("\ufece");
- sb.append("\145");
- sb.append("\ufece");
sb.append("\217");
sb.append("\u0263");
sb.append("\220");
@@ -4359,7 +4199,7 @@ public class EncodedActionTable8 {
sb.append("\010");
sb.append("\314");
sb.append("\114");
- sb.append("\u02b1");
+ sb.append("\u02b0");
sb.append("\116");
sb.append("\065");
sb.append("\001");
@@ -4528,5 +4368,165 @@ public class EncodedActionTable8 {
sb.append("\uff4a");
sb.append("\206");
sb.append("\uff4a");
+ sb.append("\207");
+ sb.append("\uff4a");
+ sb.append("\210");
+ sb.append("\uff4a");
+ sb.append("\211");
+ sb.append("\uff4a");
+ sb.append("\213");
+ sb.append("\uff4a");
+ sb.append("\214");
+ sb.append("\uff4a");
+ sb.append("\215");
+ sb.append("\uff4a");
+ sb.append("\216");
+ sb.append("\uff4a");
+ sb.append("\217");
+ sb.append("\uff4a");
+ sb.append("\220");
+ sb.append("\uff4a");
+ sb.append("\221");
+ sb.append("\uff4a");
+ sb.append("\225");
+ sb.append("\uff4a");
+ sb.append("\230");
+ sb.append("\uff4a");
+ sb.append("\231");
+ sb.append("\uff4a");
+ sb.append("\232");
+ sb.append("\uff4a");
+ sb.append("\233");
+ sb.append("\uff4a");
+ sb.append("\235");
+ sb.append("\uff4a");
+ sb.append("\001");
+ sb.append("\002");
+ sb.append("\000");
+ sb.append("\030");
+ sb.append("\043");
+ sb.append("\uff44");
+ sb.append("\054");
+ sb.append("\uff44");
+ sb.append("\056");
+ sb.append("\uff44");
+ sb.append("\107");
+ sb.append("\uff44");
+ sb.append("\115");
+ sb.append("\uff44");
+ sb.append("\217");
+ sb.append("\uff44");
+ sb.append("\220");
+ sb.append("\uff44");
+ sb.append("\221");
+ sb.append("\uff44");
+ sb.append("\222");
+ sb.append("\uff44");
+ sb.append("\223");
+ sb.append("\uff44");
+ sb.append("\224");
+ sb.append("\uff44");
+ sb.append("\001");
+ sb.append("\002");
+ sb.append("\000");
+ sb.append("\004");
+ sb.append("\012");
+ sb.append("\u02a6");
+ sb.append("\001");
+ sb.append("\002");
+ sb.append("\000");
+ sb.append("\004");
+ sb.append("\043");
+ sb.append("\u03ed");
+ sb.append("\001");
+ sb.append("\002");
+ sb.append("\000");
+ sb.append("\030");
+ sb.append("\043");
+ sb.append("\uff40");
+ sb.append("\054");
+ sb.append("\uff40");
+ sb.append("\056");
+ sb.append("\uff40");
+ sb.append("\107");
+ sb.append("\uff40");
+ sb.append("\115");
+ sb.append("\uff40");
+ sb.append("\217");
+ sb.append("\uff40");
+ sb.append("\220");
+ sb.append("\uff40");
+ sb.append("\221");
+ sb.append("\uff40");
+ sb.append("\222");
+ sb.append("\uff40");
+ sb.append("\223");
+ sb.append("\uff40");
+ sb.append("\224");
+ sb.append("\uff40");
+ sb.append("\001");
+ sb.append("\002");
+ sb.append("\000");
+ sb.append("\232");
+ sb.append("\004");
+ sb.append("\uff51");
+ sb.append("\005");
+ sb.append("\uff51");
+ sb.append("\010");
+ sb.append("\uff51");
+ sb.append("\017");
+ sb.append("\uff51");
+ sb.append("\020");
+ sb.append("\uff51");
+ sb.append("\021");
+ sb.append("\uff51");
+ sb.append("\022");
+ sb.append("\uff51");
+ sb.append("\023");
+ sb.append("\uff51");
+ sb.append("\024");
+ sb.append("\uff51");
+ sb.append("\025");
+ sb.append("\uff51");
+ sb.append("\026");
+ sb.append("\uff51");
+ sb.append("\027");
+ sb.append("\uff51");
+ sb.append("\030");
+ sb.append("\uff51");
+ sb.append("\031");
+ sb.append("\uff51");
+ sb.append("\032");
+ sb.append("\uff51");
+ sb.append("\033");
+ sb.append("\uff51");
+ sb.append("\034");
+ sb.append("\uff51");
+ sb.append("\035");
+ sb.append("\uff51");
+ sb.append("\036");
+ sb.append("\uff51");
+ sb.append("\037");
+ sb.append("\uff51");
+ sb.append("\040");
+ sb.append("\uff51");
+ sb.append("\041");
+ sb.append("\uff51");
+ sb.append("\042");
+ sb.append("\uff51");
+ sb.append("\043");
+ sb.append("\uff51");
+ sb.append("\044");
+ sb.append("\uff51");
+ sb.append("\045");
+ sb.append("\uff51");
+ sb.append("\046");
+ sb.append("\uff51");
+ sb.append("\050");
+ sb.append("\uff51");
+ sb.append("\051");
+ sb.append("\uff51");
+ sb.append("\052");
+ sb.append("\uff51");
}
}
\ 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 8103ff4..523a094 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,180 +28,6 @@ public class EncodedActionTable9 {
}
protected EncodedActionTable9() {
sb = new StringBuilder();
- sb.append("\207");
- sb.append("\uff4a");
- sb.append("\210");
- sb.append("\uff4a");
- sb.append("\211");
- sb.append("\uff4a");
- sb.append("\213");
- sb.append("\uff4a");
- sb.append("\214");
- sb.append("\uff4a");
- sb.append("\215");
- sb.append("\uff4a");
- sb.append("\216");
- sb.append("\uff4a");
- sb.append("\217");
- sb.append("\uff4a");
- sb.append("\220");
- sb.append("\uff4a");
- sb.append("\221");
- sb.append("\uff4a");
- sb.append("\225");
- sb.append("\uff4a");
- sb.append("\230");
- sb.append("\uff4a");
- sb.append("\231");
- sb.append("\uff4a");
- sb.append("\232");
- sb.append("\uff4a");
- sb.append("\233");
- sb.append("\uff4a");
- sb.append("\235");
- sb.append("\uff4a");
- sb.append("\001");
- sb.append("\002");
- sb.append("\000");
- sb.append("\030");
- sb.append("\043");
- sb.append("\uff44");
- sb.append("\054");
- sb.append("\uff44");
- sb.append("\056");
- sb.append("\uff44");
- sb.append("\107");
- sb.append("\uff44");
- sb.append("\115");
- sb.append("\uff44");
- sb.append("\217");
- sb.append("\uff44");
- sb.append("\220");
- sb.append("\uff44");
- sb.append("\221");
- sb.append("\uff44");
- sb.append("\222");
- sb.append("\uff44");
- sb.append("\223");
- sb.append("\uff44");
- sb.append("\224");
- sb.append("\uff44");
- sb.append("\001");
- sb.append("\002");
- sb.append("\000");
- sb.append("\022");
- sb.append("\010");
- sb.append("\314");
- sb.append("\012");
- sb.append("\uff05");
- sb.append("\072");
- sb.append("\u0272");
- sb.append("\073");
- sb.append("\u0275");
- sb.append("\111");
- sb.append("\u0253");
- sb.append("\114");
- sb.append("\u0250");
- sb.append("\116");
- sb.append("\065");
- sb.append("\145");
- sb.append("\u0276");
- sb.append("\001");
- sb.append("\002");
- sb.append("\000");
- sb.append("\004");
- sb.append("\043");
- sb.append("\u03ee");
- sb.append("\001");
- sb.append("\002");
- sb.append("\000");
- sb.append("\030");
- sb.append("\043");
- sb.append("\uff40");
- sb.append("\054");
- sb.append("\uff40");
- sb.append("\056");
- sb.append("\uff40");
- sb.append("\107");
- sb.append("\uff40");
- sb.append("\115");
- sb.append("\uff40");
- sb.append("\217");
- sb.append("\uff40");
- sb.append("\220");
- sb.append("\uff40");
- sb.append("\221");
- sb.append("\uff40");
- sb.append("\222");
- sb.append("\uff40");
- sb.append("\223");
- sb.append("\uff40");
- sb.append("\224");
- sb.append("\uff40");
- sb.append("\001");
- sb.append("\002");
- sb.append("\000");
- sb.append("\232");
- sb.append("\004");
- sb.append("\uff51");
- sb.append("\005");
- sb.append("\uff51");
- sb.append("\010");
- sb.append("\uff51");
- sb.append("\017");
- sb.append("\uff51");
- sb.append("\020");
- sb.append("\uff51");
- sb.append("\021");
- sb.append("\uff51");
- sb.append("\022");
- sb.append("\uff51");
- sb.append("\023");
- sb.append("\uff51");
- sb.append("\024");
- sb.append("\uff51");
- sb.append("\025");
- sb.append("\uff51");
- sb.append("\026");
- sb.append("\uff51");
- sb.append("\027");
- sb.append("\uff51");
- sb.append("\030");
- sb.append("\uff51");
- sb.append("\031");
- sb.append("\uff51");
- sb.append("\032");
- sb.append("\uff51");
- sb.append("\033");
- sb.append("\uff51");
- sb.append("\034");
- sb.append("\uff51");
- sb.append("\035");
- sb.append("\uff51");
- sb.append("\036");
- sb.append("\uff51");
- sb.append("\037");
- sb.append("\uff51");
- sb.append("\040");
- sb.append("\uff51");
- sb.append("\041");
- sb.append("\uff51");
- sb.append("\042");
- sb.append("\uff51");
- sb.append("\043");
- sb.append("\uff51");
- sb.append("\044");
- sb.append("\uff51");
- sb.append("\045");
- sb.append("\uff51");
- sb.append("\046");
- sb.append("\uff51");
- sb.append("\050");
- sb.append("\uff51");
- sb.append("\051");
- sb.append("\uff51");
- sb.append("\052");
- sb.append("\uff51");
sb.append("\053");
sb.append("\uff51");
sb.append("\054");
@@ -453,7 +279,7 @@ public class EncodedActionTable9 {
sb.append("\000");
sb.append("\004");
sb.append("\225");
- sb.append("\u03f1");
+ sb.append("\u03f0");
sb.append("\001");
sb.append("\002");
sb.append("\000");
@@ -485,7 +311,7 @@ public class EncodedActionTable9 {
sb.append("\000");
sb.append("\004");
sb.append("\226");
- sb.append("\u03f3");
+ sb.append("\u03f2");
sb.append("\001");
sb.append("\002");
sb.append("\000");
@@ -533,17 +359,11 @@ public class EncodedActionTable9 {
sb.append("\001");
sb.append("\002");
sb.append("\000");
- sb.append("\004");
- sb.append("\012");
- sb.append("\u02a7");
- sb.append("\001");
- sb.append("\002");
- sb.append("\000");
sb.append("\006");
sb.append("\124");
- sb.append("\u02a9");
+ sb.append("\u02a8");
sb.append("\146");
- sb.append("\u03f8");
+ sb.append("\u03f6");
sb.append("\001");
sb.append("\002");
sb.append("\000");
@@ -575,11 +395,11 @@ public class EncodedActionTable9 {
sb.append("\000");
sb.append("\010");
sb.append("\106");
- sb.append("\u02b6");
- sb.append("\124");
sb.append("\u02b5");
+ sb.append("\124");
+ sb.append("\u02b4");
sb.append("\146");
- sb.append("\u02b8");
+ sb.append("\u02b7");
sb.append("\001");
sb.append("\002");
sb.append("\000");
@@ -611,13 +431,13 @@ public class EncodedActionTable9 {
sb.append("\000");
sb.append("\004");
sb.append("\021");
- sb.append("\u03fc");
+ sb.append("\u03fa");
sb.append("\001");
sb.append("\002");
sb.append("\000");
sb.append("\004");
sb.append("\225");
- sb.append("\u03fd");
+ sb.append("\u03fb");
sb.append("\001");
sb.append("\002");
sb.append("\000");
@@ -789,7 +609,7 @@ public class EncodedActionTable9 {
sb.append("\176");
sb.append("\241");
sb.append("\226");
- sb.append("\u03ff");
+ sb.append("\u03fd");
sb.append("\237");
sb.append("\240");
sb.append("\242");
@@ -799,7 +619,7 @@ public class EncodedActionTable9 {
sb.append("\000");
sb.append("\004");
sb.append("\146");
- sb.append("\u0400");
+ sb.append("\u03fe");
sb.append("\001");
sb.append("\002");
sb.append("\000");
@@ -1081,7 +901,7 @@ public class EncodedActionTable9 {
sb.append("\000");
sb.append("\004");
sb.append("\234");
- sb.append("\u0403");
+ sb.append("\u0401");
sb.append("\001");
sb.append("\002");
sb.append("\000");
@@ -1351,7 +1171,7 @@ public class EncodedActionTable9 {
sb.append("\000");
sb.append("\004");
sb.append("\131");
- sb.append("\u0407");
+ sb.append("\u0405");
sb.append("\001");
sb.append("\002");
sb.append("\000");
@@ -1477,7 +1297,7 @@ public class EncodedActionTable9 {
sb.append("\000");
sb.append("\006");
sb.append("\065");
- sb.append("\u040b");
+ sb.append("\u0409");
sb.append("\106");
sb.append("\uff38");
sb.append("\001");
@@ -1485,7 +1305,7 @@ public class EncodedActionTable9 {
sb.append("\000");
sb.append("\004");
sb.append("\106");
- sb.append("\u040d");
+ sb.append("\u040b");
sb.append("\001");
sb.append("\002");
sb.append("\000");
@@ -1539,9 +1359,9 @@ public class EncodedActionTable9 {
sb.append("\044");
sb.append("\ufed0");
sb.append("\107");
- sb.append("\u0412");
+ sb.append("\u0410");
sb.append("\115");
- sb.append("\u0414");
+ sb.append("\u0412");
sb.append("\217");
sb.append("\u0263");
sb.append("\220");
@@ -1573,7 +1393,7 @@ public class EncodedActionTable9 {
sb.append("\000");
sb.append("\004");
sb.append("\044");
- sb.append("\u02db");
+ sb.append("\u02da");
sb.append("\001");
sb.append("\002");
sb.append("\000");
@@ -1841,7 +1661,7 @@ public class EncodedActionTable9 {
sb.append("\000");
sb.append("\004");
sb.append("\043");
- sb.append("\u0416");
+ sb.append("\u0414");
sb.append("\001");
sb.append("\002");
sb.append("\000");
@@ -2157,7 +1977,7 @@ public class EncodedActionTable9 {
sb.append("\000");
sb.append("\004");
sb.append("\225");
- sb.append("\u0419");
+ sb.append("\u0417");
sb.append("\001");
sb.append("\002");
sb.append("\000");
@@ -2189,7 +2009,7 @@ public class EncodedActionTable9 {
sb.append("\000");
sb.append("\004");
sb.append("\226");
- sb.append("\u041b");
+ sb.append("\u0419");
sb.append("\001");
sb.append("\002");
sb.append("\000");
@@ -2203,7 +2023,7 @@ public class EncodedActionTable9 {
sb.append("\000");
sb.append("\004");
sb.append("\146");
- sb.append("\u041d");
+ sb.append("\u041b");
sb.append("\001");
sb.append("\002");
sb.append("\000");
@@ -2243,9 +2063,9 @@ public class EncodedActionTable9 {
sb.append("\000");
sb.append("\006");
sb.append("\124");
- sb.append("\u02dd");
+ sb.append("\u02dc");
sb.append("\146");
- sb.append("\u0420");
+ sb.append("\u041e");
sb.append("\001");
sb.append("\002");
sb.append("\000");
@@ -2287,13 +2107,13 @@ public class EncodedActionTable9 {
sb.append("\012");
sb.append("\072");
sb.append("\015");
- sb.append("\u0428");
+ sb.append("\u0426");
sb.append("\104");
- sb.append("\u0427");
+ sb.append("\u0425");
sb.append("\105");
- sb.append("\u0426");
+ sb.append("\u0424");
sb.append("\231");
- sb.append("\u0425");
+ sb.append("\u0423");
sb.append("\001");
sb.append("\002");
sb.append("\000");
@@ -2303,7 +2123,7 @@ public class EncodedActionTable9 {
sb.append("\015");
sb.append("\ufd6f");
sb.append("\067");
- sb.append("\u0433");
+ sb.append("\u0431");
sb.append("\103");
sb.append("\ufd6f");
sb.append("\104");
@@ -2311,7 +2131,7 @@ public class EncodedActionTable9 {
sb.append("\105");
sb.append("\ufd6f");
sb.append("\211");
- sb.append("\u0432");
+ sb.append("\u0430");
sb.append("\231");
sb.append("\ufd6f");
sb.append("\232");
@@ -2451,7 +2271,7 @@ public class EncodedActionTable9 {
sb.append("\010");
sb.append("\214");
sb.append("\011");
- sb.append("\u042a");
+ sb.append("\u0428");
sb.append("\012");
sb.append("\072");
sb.append("\015");
@@ -2575,7 +2395,7 @@ public class EncodedActionTable9 {
sb.append("\031");
sb.append("\257");
sb.append("\107");
- sb.append("\u042f");
+ sb.append("\u042d");
sb.append("\125");
sb.append("\246");
sb.append("\126");
@@ -2693,7 +2513,7 @@ public class EncodedActionTable9 {
sb.append("\176");
sb.append("\ufde2");
sb.append("\211");
- sb.append("\u042b");
+ sb.append("\u0429");
sb.append("\237");
sb.append("\ufde2");
sb.append("\242");
@@ -2869,7 +2689,7 @@ public class EncodedActionTable9 {
sb.append("\176");
sb.append("\241");
sb.append("\212");
- sb.append("\u042d");
+ sb.append("\u042b");
sb.append("\237");
sb.append("\240");
sb.append("\242");
@@ -2879,7 +2699,7 @@ public class EncodedActionTable9 {
sb.append("\000");
sb.append("\004");
sb.append("\107");
- sb.append("\u042e");
+ sb.append("\u042c");
sb.append("\001");
sb.append("\002");
sb.append("\000");
@@ -2921,7 +2741,7 @@ public class EncodedActionTable9 {
sb.append("\000");
sb.append("\004");
sb.append("\107");
- sb.append("\u0431");
+ sb.append("\u042f");
sb.append("\001");
sb.append("\002");
sb.append("\000");
@@ -2949,7 +2769,7 @@ public class EncodedActionTable9 {
sb.append("\012");
sb.append("\072");
sb.append("\013");
- sb.append("\u0438");
+ sb.append("\u0436");
sb.append("\116");
sb.append("\u011d");
sb.append("\001");
@@ -2989,7 +2809,7 @@ public class EncodedActionTable9 {
sb.append("\000");
sb.append("\004");
sb.append("\212");
- sb.append("\u0439");
+ sb.append("\u0437");
sb.append("\001");
sb.append("\002");
sb.append("\000");
@@ -3029,13 +2849,13 @@ public class EncodedActionTable9 {
sb.append("\116");
sb.append("\u011d");
sb.append("\225");
- sb.append("\u032f");
+ sb.append("\u032e");
sb.append("\001");
sb.append("\002");
sb.append("\000");
sb.append("\004");
sb.append("\225");
- sb.append("\u043c");
+ sb.append("\u043a");
sb.append("\001");
sb.append("\002");
sb.append("\000");
@@ -3067,7 +2887,7 @@ public class EncodedActionTable9 {
sb.append("\000");
sb.append("\004");
sb.append("\226");
- sb.append("\u043e");
+ sb.append("\u043c");
sb.append("\001");
sb.append("\002");
sb.append("\000");
@@ -3081,7 +2901,7 @@ public class EncodedActionTable9 {
sb.append("\000");
sb.append("\004");
sb.append("\106");
- sb.append("\u0440");
+ sb.append("\u043e");
sb.append("\001");
sb.append("\002");
sb.append("\000");
@@ -3349,7 +3169,7 @@ public class EncodedActionTable9 {
sb.append("\106");
sb.append("\075");
sb.append("\107");
- sb.append("\u0442");
+ sb.append("\u0440");
sb.append("\111");
sb.append("\216");
sb.append("\112");
@@ -3977,7 +3797,7 @@ public class EncodedActionTable9 {
sb.append("\031");
sb.append("\ufdc1");
sb.append("\033");
- sb.append("\u045f");
+ sb.append("\u045d");
sb.append("\125");
sb.append("\ufdc1");
sb.append("\126");
@@ -4073,7 +3893,7 @@ public class EncodedActionTable9 {
sb.append("\031");
sb.append("\ufdc5");
sb.append("\033");
- sb.append("\u0449");
+ sb.append("\u0447");
sb.append("\125");
sb.append("\ufdc5");
sb.append("\126");
@@ -4141,7 +3961,7 @@ public class EncodedActionTable9 {
sb.append("\016");
sb.append("\u0107");
sb.append("\071");
- sb.append("\u044e");
+ sb.append("\u044c");
sb.append("\072");
sb.append("\014");
sb.append("\111");
@@ -4151,9 +3971,9 @@ public class EncodedActionTable9 {
sb.append("\116");
sb.append("\065");
sb.append("\153");
- sb.append("\u044d");
- sb.append("\211");
sb.append("\u044b");
+ sb.append("\211");
+ sb.append("\u0449");
sb.append("\217");
sb.append("\311");
sb.append("\225");
@@ -4165,7 +3985,7 @@ public class EncodedActionTable9 {
sb.append("\000");
sb.append("\006");
sb.append("\070");
- sb.append("\u0456");
+ sb.append("\u0454");
sb.append("\226");
sb.append("\uff32");
sb.append("\001");
@@ -4197,7 +4017,7 @@ public class EncodedActionTable9 {
sb.append("\061");
sb.append("\032");
sb.append("\071");
- sb.append("\u02fa");
+ sb.append("\u02f9");
sb.append("\072");
sb.append("\014");
sb.append("\074");
@@ -4239,7 +4059,7 @@ public class EncodedActionTable9 {
sb.append("\130");
sb.append("\074");
sb.append("\153");
- sb.append("\u02f4");
+ sb.append("\u02f3");
sb.append("\167");
sb.append("\124");
sb.append("\170");
@@ -4325,7 +4145,7 @@ public class EncodedActionTable9 {
sb.append("\000");
sb.append("\004");
sb.append("\225");
- sb.append("\u044f");
+ sb.append("\u044d");
sb.append("\001");
sb.append("\002");
sb.append("\000");
@@ -4355,7 +4175,7 @@ public class EncodedActionTable9 {
sb.append("\061");
sb.append("\032");
sb.append("\071");
- sb.append("\u02fa");
+ sb.append("\u02f9");
sb.append("\072");
sb.append("\014");
sb.append("\074");
@@ -4397,7 +4217,7 @@ public class EncodedActionTable9 {
sb.append("\130");
sb.append("\074");
sb.append("\153");
- sb.append("\u02f4");
+ sb.append("\u02f3");
sb.append("\167");
sb.append("\124");
sb.append("\170");
@@ -4449,7 +4269,7 @@ public class EncodedActionTable9 {
sb.append("\000");
sb.append("\004");
sb.append("\226");
- sb.append("\u0451");
+ sb.append("\u044f");
sb.append("\001");
sb.append("\002");
sb.append("\000");
@@ -4471,7 +4291,7 @@ public class EncodedActionTable9 {
sb.append("\000");
sb.append("\004");
sb.append("\212");
- sb.append("\u0454");
+ sb.append("\u0452");
sb.append("\001");
sb.append("\002");
sb.append("\000");
@@ -4491,7 +4311,7 @@ public class EncodedActionTable9 {
sb.append("\000");
sb.append("\004");
sb.append("\226");
- sb.append("\u0458");
+ sb.append("\u0456");
sb.append("\001");
sb.append("\002");
sb.append("\000");
@@ -4503,7 +4323,7 @@ public class EncodedActionTable9 {
sb.append("\016");
sb.append("\u0107");
sb.append("\071");
- sb.append("\u044e");
+ sb.append("\u044c");
sb.append("\072");
sb.append("\014");
sb.append("\111");
@@ -4513,9 +4333,9 @@ public class EncodedActionTable9 {
sb.append("\116");
sb.append("\065");
sb.append("\153");
- sb.append("\u044d");
- sb.append("\211");
sb.append("\u044b");
+ sb.append("\211");
+ sb.append("\u0449");
sb.append("\217");
sb.append("\311");
sb.append("\225");
@@ -4528,5 +4348,185 @@ public class EncodedActionTable9 {
sb.append("\004");
sb.append("\226");
sb.append("\uff31");
+ sb.append("\001");
+ sb.append("\002");
+ sb.append("\000");
+ sb.append("\240");
+ sb.append("\003");
+ sb.append("\142");
+ sb.append("\004");
+ sb.append("\174");
+ sb.append("\005");
+ sb.append("\211");
+ sb.append("\006");
+ sb.append("\127");
+ sb.append("\007");
+ sb.append("\011");
+ sb.append("\010");
+ sb.append("\036");
+ sb.append("\011");
+ sb.append("\063");
+ sb.append("\012");
+ sb.append("\072");
+ sb.append("\014");
+ sb.append("\113");
+ sb.append("\015");
+ sb.append("\160");
+ sb.append("\016");
+ sb.append("\156");
+ sb.append("\017");
+ sb.append("\150");
+ sb.append("\020");
+ sb.append("\144");
+ sb.append("\021");
+ sb.append("\051");
+ sb.append("\023");
+ sb.append("\035");
+ sb.append("\025");
+ sb.append("\121");
+ sb.append("\027");
+ sb.append("\210");
+ sb.append("\032");
+ sb.append("\123");
+ sb.append("\034");
+ sb.append("\157");
+ sb.append("\040");
+ sb.append("\066");
+ sb.append("\041");
+ sb.append("\147");
+ sb.append("\042");
+ sb.append("\105");
+ sb.append("\043");
+ sb.append("\217");
+ sb.append("\045");
+ sb.append("\167");
+ sb.append("\046");
+ sb.append("\013");
+ sb.append("\047");
+ sb.append("\046");
+ sb.append("\050");
+ sb.append("\044");
+ sb.append("\052");
+ sb.append("\206");
+ sb.append("\054");
+ sb.append("\u0283");
+ sb.append("\055");
+ sb.append("\012");
+ sb.append("\057");
+ sb.append("\115");
+ sb.append("\060");
+ sb.append("\177");
+ sb.append("\061");
+ sb.append("\032");
+ sb.append("\071");
+ sb.append("\202");
+ sb.append("\072");
+ sb.append("\014");
+ sb.append("\074");
+ sb.append("\021");
+ sb.append("\075");
+ sb.append("\141");
+ sb.append("\076");
+ sb.append("\053");
+ sb.append("\077");
+ sb.append("\055");
+ sb.append("\100");
+ sb.append("\161");
+ sb.append("\101");
+ sb.append("\006");
+ sb.append("\102");
+ sb.append("\037");
+ sb.append("\106");
+ sb.append("\075");
+ sb.append("\111");
+ sb.append("\216");
+ sb.append("\112");
+ sb.append("\155");
+ sb.append("\113");
+ sb.append("\043");
+ sb.append("\114");
+ sb.append("\077");
+ sb.append("\115");
+ sb.append("\025");
+ sb.append("\116");
+ sb.append("\065");
+ sb.append("\117");
+ sb.append("\031");
+ sb.append("\120");
+ sb.append("\104");
+ sb.append("\121");
+ sb.append("\057");
+ sb.append("\122");
+ sb.append("\152");
+ sb.append("\123");
+ sb.append("\126");
+ sb.append("\130");
+ sb.append("\074");
+ sb.append("\146");
+ sb.append("\010");
+ sb.append("\167");
+ sb.append("\124");
+ sb.append("\170");
+ sb.append("\103");
+ sb.append("\174");
+ sb.append("\176");
+ sb.append("\175");
+ sb.append("\016");
+ sb.append("\177");
+ sb.append("\062");
+ sb.append("\200");
+ sb.append("\204");
+ sb.append("\201");
+ sb.append("\030");
+ sb.append("\202");
+ sb.append("\162");
+ sb.append("\203");
+ sb.append("\042");
+ sb.append("\204");
+ sb.append("\153");
+ sb.append("\205");
+ sb.append("\110");
+ sb.append("\206");
+ sb.append("\164");
+ sb.append("\207");
+ sb.append("\106");
+ sb.append("\210");
+ sb.append("\040");
+ sb.append("\211");
+ sb.append("\061");
+ sb.append("\213");
+ sb.append("\114");
+ sb.append("\217");
+ sb.append("\047");
+ sb.append("\225");
+ sb.append("\203");
+ sb.append("\227");
+ sb.append("\u0457");
+ sb.append("\230");
+ sb.append("\120");
+ sb.append("\231");
+ sb.append("\134");
+ sb.append("\232");
+ sb.append("\070");
+ sb.append("\233");
+ sb.append("\143");
+ sb.append("\001");
+ sb.append("\002");
+ sb.append("\000");
+ sb.append("\252");
+ sb.append("\003");
+ sb.append("\uff8b");
+ sb.append("\004");
+ sb.append("\uff8b");
+ sb.append("\005");
+ sb.append("\uff8b");
+ sb.append("\006");
+ sb.append("\uff8b");
+ sb.append("\007");
+ sb.append("\uff8b");
+ sb.append("\010");
+ sb.append("\uff8b");
+ sb.append("\011");
+ sb.append("\uff8b");
}
}
\ No newline at end of file
diff --git a/php/php.editor/src/org/netbeans/modules/php/editor/parser/astnodes/FieldsDeclaration.java b/php/php.editor/src/org/netbeans/modules/php/editor/parser/astnodes/FieldsDeclaration.java
index 5ae6ab4..3ca0703 100644
--- a/php/php.editor/src/org/netbeans/modules/php/editor/parser/astnodes/FieldsDeclaration.java
+++ b/php/php.editor/src/org/netbeans/modules/php/editor/parser/astnodes/FieldsDeclaration.java
@@ -19,27 +19,20 @@
package org.netbeans.modules.php.editor.parser.astnodes;
import java.util.ArrayList;
-import java.util.Collections;
import java.util.Iterator;
import java.util.List;
-import org.netbeans.api.annotations.common.CheckForNull;
/**
- * Represents a fields declaration.
- * <pre>
- * e.g.
- * var $a, $b;
+ * Represents a fields declaration
+ * <pre>e.g.<pre> var $a, $b;
* public $a = 3;
* final private static $var;
- * protected ?int $int = 0; // PHP 7.4
- * </pre>
*/
public class FieldsDeclaration extends BodyDeclaration {
- private final List<SingleFieldDeclaration> fields = new ArrayList<>();
- private final Expression fieldType;
+ private final ArrayList<SingleFieldDeclaration> fields = new ArrayList<>();
- public FieldsDeclaration(int start, int end, int modifier, Expression fieldType, List variablesAndDefaults) {
+ public FieldsDeclaration(int start, int end, int modifier, List variablesAndDefaults) {
super(start, end, modifier);
if (variablesAndDefaults == null || variablesAndDefaults.isEmpty()) {
@@ -52,17 +45,16 @@ public class FieldsDeclaration extends BodyDeclaration {
this.fields.add((SingleFieldDeclaration) next);
} else {
ASTNode[] element = (ASTNode[]) next;
- SingleFieldDeclaration field = createField((Variable) element[0], (Expression) element[1], fieldType);
+ SingleFieldDeclaration field = createField((Variable) element[0], (Expression) element[1]);
this.fields.add(field);
}
}
- this.fieldType = fieldType;
}
- private SingleFieldDeclaration createField(Variable name, Expression value, Expression fieldType) {
+ private SingleFieldDeclaration createField(Variable name, Expression value) {
int start = name.getStartOffset();
int end = value == null ? name.getEndOffset() : value.getEndOffset();
- final SingleFieldDeclaration result = new SingleFieldDeclaration(start, end, name, value, fieldType);
+ final SingleFieldDeclaration result = new SingleFieldDeclaration(start, end, name, value);
return result;
}
@@ -72,7 +64,7 @@ public class FieldsDeclaration extends BodyDeclaration {
* @return List of single fields
*/
public List<SingleFieldDeclaration> getFields() {
- return Collections.unmodifiableList(this.fields);
+ return this.fields;
}
public Expression[] getInitialValues() {
@@ -93,11 +85,6 @@ public class FieldsDeclaration extends BodyDeclaration {
return result;
}
- @CheckForNull
- public Expression getFieldType() {
- return fieldType;
- }
-
@Override
public void accept(Visitor visitor) {
visitor.visit(this);
diff --git a/php/php.editor/src/org/netbeans/modules/php/editor/parser/astnodes/SingleFieldDeclaration.java b/php/php.editor/src/org/netbeans/modules/php/editor/parser/astnodes/SingleFieldDeclaration.java
index dcf685e..a9e064d 100644
--- a/php/php.editor/src/org/netbeans/modules/php/editor/parser/astnodes/SingleFieldDeclaration.java
+++ b/php/php.editor/src/org/netbeans/modules/php/editor/parser/astnodes/SingleFieldDeclaration.java
@@ -19,26 +19,20 @@
package org.netbeans.modules.php.editor.parser.astnodes;
/**
- * Represents a fields declaration.
- * <pre>
- * e.g.
- * var $a, $b;
+ * Represents a fields declaration
+ * <pre>e.g.<pre> var $a, $b;
* public $a = 3;
* final private static $var;
- * private int $int = 20; // PHP 7.4
- * </pre>
*/
public class SingleFieldDeclaration extends ASTNode {
- private final Variable name;
- private final Expression value;
- private final Expression fieldType;
+ private Variable name;
+ private Expression value;
- public SingleFieldDeclaration(int start, int end, Variable name, Expression value, Expression fieldType) {
+ public SingleFieldDeclaration(int start, int end, Variable name, Expression value) {
super(start, end);
this.name = name;
this.value = value;
- this.fieldType = fieldType;
}
/**
@@ -55,10 +49,6 @@ public class SingleFieldDeclaration extends ASTNode {
return this.value;
}
- public Expression getFieldType() {
- return fieldType;
- }
-
@Override
public void accept(Visitor visitor) {
visitor.visit(this);
@@ -66,7 +56,7 @@ public class SingleFieldDeclaration extends ASTNode {
@Override
public String toString() {
- return getFieldType() + " " + getName() + " = " + getValue(); //NOI18N
+ return getName() + " = " + getValue(); //NOI18N
}
}
diff --git a/php/php.editor/src/org/netbeans/modules/php/editor/parser/astnodes/visitors/DefaultVisitor.java b/php/php.editor/src/org/netbeans/modules/php/editor/parser/astnodes/visitors/DefaultVisitor.java
index d5839dc..9acc284 100644
--- a/php/php.editor/src/org/netbeans/modules/php/editor/parser/astnodes/visitors/DefaultVisitor.java
+++ b/php/php.editor/src/org/netbeans/modules/php/editor/parser/astnodes/visitors/DefaultVisitor.java
@@ -95,7 +95,6 @@ import org.netbeans.modules.php.editor.parser.astnodes.ReflectionVariable;
import org.netbeans.modules.php.editor.parser.astnodes.ReturnStatement;
import org.netbeans.modules.php.editor.parser.astnodes.Scalar;
import org.netbeans.modules.php.editor.parser.astnodes.SingleFieldDeclaration;
-import org.netbeans.modules.php.editor.parser.astnodes.SingleUseStatementPart;
import org.netbeans.modules.php.editor.parser.astnodes.StaticConstantAccess;
import org.netbeans.modules.php.editor.parser.astnodes.StaticFieldAccess;
import org.netbeans.modules.php.editor.parser.astnodes.StaticMethodInvocation;
@@ -109,6 +108,7 @@ import org.netbeans.modules.php.editor.parser.astnodes.TraitMethodAliasDeclarati
import org.netbeans.modules.php.editor.parser.astnodes.TryStatement;
import org.netbeans.modules.php.editor.parser.astnodes.UnaryOperation;
import org.netbeans.modules.php.editor.parser.astnodes.UseStatement;
+import org.netbeans.modules.php.editor.parser.astnodes.SingleUseStatementPart;
import org.netbeans.modules.php.editor.parser.astnodes.UseTraitStatement;
import org.netbeans.modules.php.editor.parser.astnodes.UseTraitStatementPart;
import org.netbeans.modules.php.editor.parser.astnodes.Variable;
@@ -287,7 +287,6 @@ public class DefaultVisitor implements Visitor {
@Override
public void visit(FieldsDeclaration node) {
- scan(node.getFieldType());
scan(node.getFields());
}
diff --git a/php/php.editor/src/org/netbeans/modules/php/editor/resources/layer.xml b/php/php.editor/src/org/netbeans/modules/php/editor/resources/layer.xml
index 9aef12e..1eaa0c7 100644
--- a/php/php.editor/src/org/netbeans/modules/php/editor/resources/layer.xml
+++ b/php/php.editor/src/org/netbeans/modules/php/editor/resources/layer.xml
@@ -421,7 +421,6 @@
<file name="org-netbeans-modules-php-editor-verification-PHP74UnhandledError.instance"/>
<file name="org-netbeans-modules-php-editor-verification-ReturnTypeHintError.instance"/>
<file name="org-netbeans-modules-php-editor-verification-TypeRedeclarationHintError.instance"/>
- <file name="org-netbeans-modules-php-editor-verification-UnusableTypesUnhandledError.instance"/>
</folder>
</folder>
</folder>
diff --git a/php/php.editor/src/org/netbeans/modules/php/editor/verification/FieldRedeclarationHintError.java b/php/php.editor/src/org/netbeans/modules/php/editor/verification/FieldRedeclarationHintError.java
index e48c219..eb50654 100644
--- a/php/php.editor/src/org/netbeans/modules/php/editor/verification/FieldRedeclarationHintError.java
+++ b/php/php.editor/src/org/netbeans/modules/php/editor/verification/FieldRedeclarationHintError.java
@@ -97,9 +97,10 @@ public class FieldRedeclarationHintError extends HintErrorRule {
if (CancelSupport.getDefault().isCancelled()) {
return Collections.emptySet();
}
- // some declaredFields may be annotations e.g. @property int $count Description
- // So, check whether a field is an annotation
- if (!declaredField.isAnnotation()) {
+ // if property type-hints are added in future, FiledElement should be improved
+ // e.g. check whether a field is an annotation, then add the field for it
+ Collection<? extends String> defaultTypeNames = declaredField.getDefaultTypeNames();
+ if (defaultTypeNames.isEmpty()) {
String fieldName = declaredField.getName();
FieldElement firstDeclaredField = firstDeclaredFields.get(fieldName);
if (firstDeclaredField == null) {
diff --git a/php/php.editor/src/org/netbeans/modules/php/editor/verification/PHP74UnhandledError.java b/php/php.editor/src/org/netbeans/modules/php/editor/verification/PHP74UnhandledError.java
index 0b2f5b0..8053d90 100644
--- a/php/php.editor/src/org/netbeans/modules/php/editor/verification/PHP74UnhandledError.java
+++ b/php/php.editor/src/org/netbeans/modules/php/editor/verification/PHP74UnhandledError.java
@@ -29,7 +29,6 @@ import org.netbeans.modules.php.editor.CodeUtils;
import org.netbeans.modules.php.editor.parser.PHPParseResult;
import org.netbeans.modules.php.editor.parser.astnodes.ASTNode;
import org.netbeans.modules.php.editor.parser.astnodes.Assignment;
-import org.netbeans.modules.php.editor.parser.astnodes.FieldsDeclaration;
import org.netbeans.modules.php.editor.parser.astnodes.visitors.DefaultVisitor;
import org.openide.filesystems.FileObject;
import org.openide.util.NbBundle;
@@ -90,27 +89,12 @@ public final class PHP74UnhandledError extends UnhandledErrorRule {
super.visit(node);
}
- @Override
- public void visit(FieldsDeclaration node) {
- if (CancelSupport.getDefault().isCancelled()) {
- return;
- }
- checkTypedProperties(node);
- super.visit(node);
- }
-
private void checkNullCoalescingAssignmet(Assignment node) {
if (node.getOperator() == Assignment.Type.COALESCE_EQUAL) { // ??=
createError(node);
}
}
- private void checkTypedProperties(FieldsDeclaration node) {
- if (node.getFieldType() != null) {
- createError(node);
- }
- }
-
private void createError(ASTNode node) {
createError(node.getStartOffset(), node.getEndOffset());
}
diff --git a/php/php.editor/src/org/netbeans/modules/php/editor/verification/UnusableTypesUnhandledError.java b/php/php.editor/src/org/netbeans/modules/php/editor/verification/UnusableTypesUnhandledError.java
deleted file mode 100644
index 25f209c..0000000
--- a/php/php.editor/src/org/netbeans/modules/php/editor/verification/UnusableTypesUnhandledError.java
+++ /dev/null
@@ -1,190 +0,0 @@
-/*
- * 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.
- */
-package org.netbeans.modules.php.editor.verification;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import org.netbeans.modules.csl.api.Error;
-import org.netbeans.modules.csl.spi.support.CancelSupport;
-import org.netbeans.modules.php.editor.CodeUtils;
-import org.netbeans.modules.php.editor.parser.PHPParseResult;
-import org.netbeans.modules.php.editor.parser.astnodes.ASTNode;
-import org.netbeans.modules.php.editor.parser.astnodes.Expression;
-import org.netbeans.modules.php.editor.parser.astnodes.FieldsDeclaration;
-import org.netbeans.modules.php.editor.parser.astnodes.FormalParameter;
-import org.netbeans.modules.php.editor.parser.astnodes.Identifier;
-import org.netbeans.modules.php.editor.parser.astnodes.NamespaceName;
-import org.netbeans.modules.php.editor.parser.astnodes.NullableType;
-import org.netbeans.modules.php.editor.parser.astnodes.visitors.DefaultVisitor;
-import org.openide.filesystems.FileObject;
-import org.openide.util.NbBundle;
-
-/**
- * Handle unusable types as errors here to avoid complicating the grammar(cup
- * file).
- *
- */
-public class UnusableTypesUnhandledError extends UnhandledErrorRule {
-
- @Override
- @NbBundle.Messages("UnusableTypesUnhandledError.displayName=Unusable types.")
- public String getDisplayName() {
- return Bundle.UnusableTypesUnhandledError_displayName();
- }
-
- @Override
- public void invoke(PHPRuleContext context, List<Error> result) {
- PHPParseResult phpParseResult = (PHPParseResult) context.parserResult;
- if (phpParseResult.getProgram() != null) {
- FileObject fileObject = phpParseResult.getSnapshot().getSource().getFileObject();
- if (fileObject != null) {
- CheckVisitor checkVisitor = new CheckVisitor(fileObject);
- phpParseResult.getProgram().accept(checkVisitor);
- result.addAll(checkVisitor.getErrors());
- }
- }
- }
-
- //~ Inner classes
- private static final class CheckVisitor extends DefaultVisitor {
-
- private final List<VerificationError> errors = new ArrayList<>();
- private final FileObject fileObject;
-
- private CheckVisitor(FileObject fileObject) {
- assert fileObject != null;
- this.fileObject = fileObject;
- }
-
- private List<VerificationError> getErrors() {
- return Collections.unmodifiableList(errors);
- }
-
- @Override
- public void visit(FieldsDeclaration node) {
- if (CancelSupport.getDefault().isCancelled()) {
- return;
- }
- Expression fieldType = node.getFieldType();
- if (fieldType != null) {
- checkFieldType(fieldType);
- }
- super.visit(node);
- }
-
- @Override
- public void visit(FormalParameter node) {
- if (CancelSupport.getDefault().isCancelled()) {
- return;
- }
- Expression parameterType = node.getParameterType();
- if (parameterType != null) {
- checkParameterType(parameterType);
- }
- super.visit(node);
- }
-
- private void checkFieldType(Expression fieldType) {
- // unusable types: void and callable PHP 7.4
- Expression type = fieldType;
- if (fieldType instanceof NullableType) {
- type = ((NullableType) fieldType).getType();
- }
- if (type == null) {
- return;
- }
- if (type instanceof Identifier) {
- if (isCallableType((Identifier) type)) {
- createError(type, "callable", "property"); // NOI18N
- }
- } else if (type instanceof NamespaceName) {
- if (isVoidType((NamespaceName) type)) {
- createError(type, "void", "property"); // NOI18N
- }
- }
- }
-
- private void checkParameterType(Expression parameterType) {
- // unusable types: void
- if (parameterType instanceof NamespaceName) {
- if (isVoidType((NamespaceName) parameterType)) {
- createError(parameterType, "void", "parameter"); // NOI18N
- }
- }
- }
-
- private void createError(ASTNode node, String type, String context) {
- createError(node.getStartOffset(), node.getEndOffset(), type, context);
- }
-
- private void createError(int startOffset, int endOffset, String type, String context) {
- errors.add(new UnusableType(fileObject, startOffset, endOffset, type, context));
- }
-
- private static boolean isCallableType(Identifier identifier) {
- return !identifier.isKeyword()
- && "callable".equals(identifier.getName().toLowerCase()); // NOI18N
- }
-
- private static boolean isVoidType(NamespaceName namespaceName) {
- return "void".equals(CodeUtils.extractUnqualifiedName(namespaceName)); // NOI18N
- }
- }
-
- private static final class UnusableType extends VerificationError {
-
- private static final String KEY = "Php.Unusable.Type"; // NOI18N
- private final String type;
- private final String context;
-
- private UnusableType(FileObject fileObject, int startOffset, int endOffset, String type, String context) {
- super(fileObject, startOffset, endOffset);
- this.type = type;
- this.context = context;
- }
-
- @NbBundle.Messages({
- "# {0} - type",
- "# {1} - context",
- "UnusableType.displayName=Unusable type: \"{0}\" cannot be used as {1} type."
- })
- @Override
- public String getDisplayName() {
- return Bundle.UnusableType_displayName(type, context);
- }
-
- @NbBundle.Messages({
- "# {0} - type",
- "# {1} - context",
- "UnusableType.description=\"{0}\" cannot be used as {1} type."
- })
- @Override
- public String getDescription() {
- return Bundle.UnusableType_description(type, context);
- }
-
- @Override
- public String getKey() {
- return KEY;
- }
-
- }
-
-}
diff --git a/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/parser/ASTPHP5ParserTest/parser/TextSearchQuery.pass b/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/parser/ASTPHP5ParserTest/parser/TextSearchQuery.pass
index 0aa3967..a1e64a3 100644
--- a/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/parser/ASTPHP5ParserTest/parser/TextSearchQuery.pass
+++ b/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/parser/ASTPHP5ParserTest/parser/TextSearchQuery.pass
@@ -18249,8 +18249,6 @@
</Interfaces>
<Block start='20971' end='21542' isCurly='true'>
<FieldsDeclaration start='20977' end='20994' modifier='public'>
- <FieldType>
- </FieldType>
<VariableNames>
<Variable start='20981' end='20984' isDollared='true'>
<Identifier start='20982' end='20984' name='op'/>
@@ -18347,8 +18345,6 @@
</Interfaces>
... 7070 lines suppressed ...
---------------------------------------------------------------------
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