diff options
author | Tom Schindl | 2014-10-30 09:01:37 +0000 |
---|---|---|
committer | Tom Schindl | 2014-10-30 09:01:37 +0000 |
commit | aa96b78c5f381fdbce2c24b1118a0f0df5459af0 (patch) | |
tree | c80544d43c92ef951363ea0e2414b636d2b7ccb2 | |
parent | 1ee815717b10c8015368f177467611f05d216652 (diff) | |
download | org.eclipse.efxclipse-aa96b78c5f381fdbce2c24b1118a0f0df5459af0.tar.gz org.eclipse.efxclipse-aa96b78c5f381fdbce2c24b1118a0f0df5459af0.tar.xz org.eclipse.efxclipse-aa96b78c5f381fdbce2c24b1118a0f0df5459af0.zip |
Bug 449260 - Add DSL to easily author NLS-Files and generate accessor
classes
12 files changed, 429 insertions, 312 deletions
diff --git a/bundles/tooling/org.eclipse.fx.ide.l10n/model/generated/NLSDsl.ecore b/bundles/tooling/org.eclipse.fx.ide.l10n/model/generated/NLSDsl.ecore index 5c556ccd3..2a579f557 100644 --- a/bundles/tooling/org.eclipse.fx.ide.l10n/model/generated/NLSDsl.ecore +++ b/bundles/tooling/org.eclipse.fx.ide.l10n/model/generated/NLSDsl.ecore @@ -64,5 +64,6 @@ <eLiterals name="ANY" literal="ANY"/> <eLiterals name="NUMBER" value="1" literal="NUMBER"/> <eLiterals name="DATE" value="2" literal="DATE"/> + <eLiterals name="TEMPORAL" value="3" literal="TEMPORAL"/> </eClassifiers> </ecore:EPackage> diff --git a/bundles/tooling/org.eclipse.fx.ide.l10n/model/generated/NLSDsl.genmodel b/bundles/tooling/org.eclipse.fx.ide.l10n/model/generated/NLSDsl.genmodel index 880362d8c..161185dd8 100644 --- a/bundles/tooling/org.eclipse.fx.ide.l10n/model/generated/NLSDsl.genmodel +++ b/bundles/tooling/org.eclipse.fx.ide.l10n/model/generated/NLSDsl.genmodel @@ -11,6 +11,7 @@ <genEnumLiterals ecoreEnumLiteral="NLSDsl.ecore#//PredefinedTypes/ANY"/> <genEnumLiterals ecoreEnumLiteral="NLSDsl.ecore#//PredefinedTypes/NUMBER"/> <genEnumLiterals ecoreEnumLiteral="NLSDsl.ecore#//PredefinedTypes/DATE"/> + <genEnumLiterals ecoreEnumLiteral="NLSDsl.ecore#//PredefinedTypes/TEMPORAL"/> </genEnums> <genClasses ecoreClass="NLSDsl.ecore#//NLS"> <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference NLSDsl.ecore#//NLS/package"/> diff --git a/bundles/tooling/org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/NLSDsl.xtextbin b/bundles/tooling/org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/NLSDsl.xtextbin Binary files differindex 3ce6994aa..11d534b1c 100644 --- a/bundles/tooling/org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/NLSDsl.xtextbin +++ b/bundles/tooling/org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/NLSDsl.xtextbin diff --git a/bundles/tooling/org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/nLSDsl/PredefinedTypes.java b/bundles/tooling/org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/nLSDsl/PredefinedTypes.java index a5ab87d79..4b932a82e 100644 --- a/bundles/tooling/org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/nLSDsl/PredefinedTypes.java +++ b/bundles/tooling/org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/nLSDsl/PredefinedTypes.java @@ -47,7 +47,17 @@ public enum PredefinedTypes implements Enumerator * @generated * @ordered */ - DATE(2, "DATE", "DATE"); + DATE(2, "DATE", "DATE"), + + /** + * The '<em><b>TEMPORAL</b></em>' literal object. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #TEMPORAL_VALUE + * @generated + * @ordered + */ + TEMPORAL(3, "TEMPORAL", "TEMPORAL"); /** * The '<em><b>ANY</b></em>' literal value. @@ -95,6 +105,21 @@ public enum PredefinedTypes implements Enumerator public static final int DATE_VALUE = 2; /** + * The '<em><b>TEMPORAL</b></em>' literal value. + * <!-- begin-user-doc --> + * <p> + * If the meaning of '<em><b>TEMPORAL</b></em>' literal object isn't clear, + * there really should be more of a description here... + * </p> + * <!-- end-user-doc --> + * @see #TEMPORAL + * @model + * @generated + * @ordered + */ + public static final int TEMPORAL_VALUE = 3; + + /** * An array of all the '<em><b>Predefined Types</b></em>' enumerators. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -106,6 +131,7 @@ public enum PredefinedTypes implements Enumerator ANY, NUMBER, DATE, + TEMPORAL, }; /** @@ -167,6 +193,7 @@ public enum PredefinedTypes implements Enumerator case ANY_VALUE: return ANY; case NUMBER_VALUE: return NUMBER; case DATE_VALUE: return DATE; + case TEMPORAL_VALUE: return TEMPORAL; } return null; } diff --git a/bundles/tooling/org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/nLSDsl/impl/NLSDslPackageImpl.java b/bundles/tooling/org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/nLSDsl/impl/NLSDslPackageImpl.java index f5cfad584..b2b5aedec 100644 --- a/bundles/tooling/org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/nLSDsl/impl/NLSDslPackageImpl.java +++ b/bundles/tooling/org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/nLSDsl/impl/NLSDslPackageImpl.java @@ -757,6 +757,7 @@ public class NLSDslPackageImpl extends EPackageImpl implements NLSDslPackage addEEnumLiteral(predefinedTypesEEnum, PredefinedTypes.ANY); addEEnumLiteral(predefinedTypesEEnum, PredefinedTypes.NUMBER); addEEnumLiteral(predefinedTypesEEnum, PredefinedTypes.DATE); + addEEnumLiteral(predefinedTypesEEnum, PredefinedTypes.TEMPORAL); // Create resource createResource(eNS_URI); diff --git a/bundles/tooling/org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g b/bundles/tooling/org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g index 8be9adeeb..2f37d659a 100644 --- a/bundles/tooling/org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g +++ b/bundles/tooling/org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g @@ -1081,6 +1081,12 @@ rulePredefinedTypes returns [Enumerator current=null] $current = grammarAccess.getPredefinedTypesAccess().getDATEEnumLiteralDeclaration_2().getEnumLiteral().getInstance(); newLeafNode(enumLiteral_2, grammarAccess.getPredefinedTypesAccess().getDATEEnumLiteralDeclaration_2()); } +) + |( enumLiteral_3='TEMPORAL' + { + $current = grammarAccess.getPredefinedTypesAccess().getTEMPORALEnumLiteralDeclaration_3().getEnumLiteral().getInstance(); + newLeafNode(enumLiteral_3, grammarAccess.getPredefinedTypesAccess().getTEMPORALEnumLiteralDeclaration_3()); + } )); diff --git a/bundles/tooling/org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.tokens b/bundles/tooling/org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.tokens index f5f029871..355bffe2f 100644 --- a/bundles/tooling/org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.tokens +++ b/bundles/tooling/org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.tokens @@ -6,6 +6,7 @@ 'ANY'=29 'DATE'=31 'NUMBER'=30 +'TEMPORAL'=32 '['=26 ']'=27 'bundle'=19 @@ -42,3 +43,4 @@ T__28=28 T__29=29 T__30=30 T__31=31 +T__32=32 diff --git a/bundles/tooling/org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDslLexer.java b/bundles/tooling/org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDslLexer.java index 77e7cb655..3b9112e9d 100644 --- a/bundles/tooling/org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDslLexer.java +++ b/bundles/tooling/org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDslLexer.java @@ -22,6 +22,7 @@ public class InternalNLSDslLexer extends Lexer { public static final int EOF=-1; public static final int T__30=30; public static final int T__31=31; + public static final int T__32=32; public static final int RULE_RICH_TEXT=5; public static final int RULE_ID=4; public static final int RULE_WS=14; @@ -382,17 +383,38 @@ public class InternalNLSDslLexer extends Lexer { } // $ANTLR end "T__31" + // $ANTLR start "T__32" + public final void mT__32() throws RecognitionException { + try { + int _type = T__32; + int _channel = DEFAULT_TOKEN_CHANNEL; + // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:27:7: ( 'TEMPORAL' ) + // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:27:9: 'TEMPORAL' + { + match("TEMPORAL"); + + + } + + state.type = _type; + state.channel = _channel; + } + finally { + } + } + // $ANTLR end "T__32" + // $ANTLR start "RULE_RICH_TEXT" public final void mRULE_RICH_TEXT() throws RecognitionException { try { int _type = RULE_RICH_TEXT; int _channel = DEFAULT_TOKEN_CHANNEL; - // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1088:16: ( '\\'\\'\\'' ( RULE_IN_RICH_STRING )* ( '\\'\\'\\'' | ( '\\'' ( '\\'' )? )? EOF ) ) - // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1088:18: '\\'\\'\\'' ( RULE_IN_RICH_STRING )* ( '\\'\\'\\'' | ( '\\'' ( '\\'' )? )? EOF ) + // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1094:16: ( '\\'\\'\\'' ( RULE_IN_RICH_STRING )* ( '\\'\\'\\'' | ( '\\'' ( '\\'' )? )? EOF ) ) + // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1094:18: '\\'\\'\\'' ( RULE_IN_RICH_STRING )* ( '\\'\\'\\'' | ( '\\'' ( '\\'' )? )? EOF ) { match("'''"); - // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1088:27: ( RULE_IN_RICH_STRING )* + // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1094:27: ( RULE_IN_RICH_STRING )* loop1: do { int alt1=2; @@ -423,7 +445,7 @@ public class InternalNLSDslLexer extends Lexer { switch (alt1) { case 1 : - // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1088:27: RULE_IN_RICH_STRING + // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1094:27: RULE_IN_RICH_STRING { mRULE_IN_RICH_STRING(); @@ -435,7 +457,7 @@ public class InternalNLSDslLexer extends Lexer { } } while (true); - // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1088:48: ( '\\'\\'\\'' | ( '\\'' ( '\\'' )? )? EOF ) + // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1094:48: ( '\\'\\'\\'' | ( '\\'' ( '\\'' )? )? EOF ) int alt4=2; int LA4_0 = input.LA(1); @@ -458,7 +480,7 @@ public class InternalNLSDslLexer extends Lexer { alt4=2;} switch (alt4) { case 1 : - // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1088:49: '\\'\\'\\'' + // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1094:49: '\\'\\'\\'' { match("'''"); @@ -466,9 +488,9 @@ public class InternalNLSDslLexer extends Lexer { } break; case 2 : - // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1088:58: ( '\\'' ( '\\'' )? )? EOF + // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1094:58: ( '\\'' ( '\\'' )? )? EOF { - // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1088:58: ( '\\'' ( '\\'' )? )? + // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1094:58: ( '\\'' ( '\\'' )? )? int alt3=2; int LA3_0 = input.LA(1); @@ -477,10 +499,10 @@ public class InternalNLSDslLexer extends Lexer { } switch (alt3) { case 1 : - // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1088:59: '\\'' ( '\\'' )? + // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1094:59: '\\'' ( '\\'' )? { match('\''); - // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1088:64: ( '\\'' )? + // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1094:64: ( '\\'' )? int alt2=2; int LA2_0 = input.LA(1); @@ -489,7 +511,7 @@ public class InternalNLSDslLexer extends Lexer { } switch (alt2) { case 1 : - // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1088:64: '\\'' + // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1094:64: '\\'' { match('\''); @@ -527,12 +549,12 @@ public class InternalNLSDslLexer extends Lexer { try { int _type = RULE_RICH_TEXT_START; int _channel = DEFAULT_TOKEN_CHANNEL; - // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1090:22: ( '\\'\\'\\'' ( RULE_IN_RICH_STRING )* ( '\\'' ( '\\'' )? )? '\\u00AB' ) - // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1090:24: '\\'\\'\\'' ( RULE_IN_RICH_STRING )* ( '\\'' ( '\\'' )? )? '\\u00AB' + // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1096:22: ( '\\'\\'\\'' ( RULE_IN_RICH_STRING )* ( '\\'' ( '\\'' )? )? '\\u00AB' ) + // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1096:24: '\\'\\'\\'' ( RULE_IN_RICH_STRING )* ( '\\'' ( '\\'' )? )? '\\u00AB' { match("'''"); - // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1090:33: ( RULE_IN_RICH_STRING )* + // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1096:33: ( RULE_IN_RICH_STRING )* loop5: do { int alt5=2; @@ -563,7 +585,7 @@ public class InternalNLSDslLexer extends Lexer { switch (alt5) { case 1 : - // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1090:33: RULE_IN_RICH_STRING + // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1096:33: RULE_IN_RICH_STRING { mRULE_IN_RICH_STRING(); @@ -575,7 +597,7 @@ public class InternalNLSDslLexer extends Lexer { } } while (true); - // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1090:54: ( '\\'' ( '\\'' )? )? + // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1096:54: ( '\\'' ( '\\'' )? )? int alt7=2; int LA7_0 = input.LA(1); @@ -584,10 +606,10 @@ public class InternalNLSDslLexer extends Lexer { } switch (alt7) { case 1 : - // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1090:55: '\\'' ( '\\'' )? + // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1096:55: '\\'' ( '\\'' )? { match('\''); - // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1090:60: ( '\\'' )? + // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1096:60: ( '\\'' )? int alt6=2; int LA6_0 = input.LA(1); @@ -596,7 +618,7 @@ public class InternalNLSDslLexer extends Lexer { } switch (alt6) { case 1 : - // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1090:60: '\\'' + // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1096:60: '\\'' { match('\''); @@ -628,11 +650,11 @@ public class InternalNLSDslLexer extends Lexer { try { int _type = RULE_RICH_TEXT_END; int _channel = DEFAULT_TOKEN_CHANNEL; - // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1092:20: ( '\\u00BB' ( RULE_IN_RICH_STRING )* ( '\\'\\'\\'' | ( '\\'' ( '\\'' )? )? EOF ) ) - // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1092:22: '\\u00BB' ( RULE_IN_RICH_STRING )* ( '\\'\\'\\'' | ( '\\'' ( '\\'' )? )? EOF ) + // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1098:20: ( '\\u00BB' ( RULE_IN_RICH_STRING )* ( '\\'\\'\\'' | ( '\\'' ( '\\'' )? )? EOF ) ) + // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1098:22: '\\u00BB' ( RULE_IN_RICH_STRING )* ( '\\'\\'\\'' | ( '\\'' ( '\\'' )? )? EOF ) { match('\u00BB'); - // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1092:31: ( RULE_IN_RICH_STRING )* + // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1098:31: ( RULE_IN_RICH_STRING )* loop8: do { int alt8=2; @@ -663,7 +685,7 @@ public class InternalNLSDslLexer extends Lexer { switch (alt8) { case 1 : - // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1092:31: RULE_IN_RICH_STRING + // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1098:31: RULE_IN_RICH_STRING { mRULE_IN_RICH_STRING(); @@ -675,7 +697,7 @@ public class InternalNLSDslLexer extends Lexer { } } while (true); - // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1092:52: ( '\\'\\'\\'' | ( '\\'' ( '\\'' )? )? EOF ) + // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1098:52: ( '\\'\\'\\'' | ( '\\'' ( '\\'' )? )? EOF ) int alt11=2; int LA11_0 = input.LA(1); @@ -698,7 +720,7 @@ public class InternalNLSDslLexer extends Lexer { alt11=2;} switch (alt11) { case 1 : - // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1092:53: '\\'\\'\\'' + // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1098:53: '\\'\\'\\'' { match("'''"); @@ -706,9 +728,9 @@ public class InternalNLSDslLexer extends Lexer { } break; case 2 : - // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1092:62: ( '\\'' ( '\\'' )? )? EOF + // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1098:62: ( '\\'' ( '\\'' )? )? EOF { - // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1092:62: ( '\\'' ( '\\'' )? )? + // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1098:62: ( '\\'' ( '\\'' )? )? int alt10=2; int LA10_0 = input.LA(1); @@ -717,10 +739,10 @@ public class InternalNLSDslLexer extends Lexer { } switch (alt10) { case 1 : - // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1092:63: '\\'' ( '\\'' )? + // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1098:63: '\\'' ( '\\'' )? { match('\''); - // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1092:68: ( '\\'' )? + // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1098:68: ( '\\'' )? int alt9=2; int LA9_0 = input.LA(1); @@ -729,7 +751,7 @@ public class InternalNLSDslLexer extends Lexer { } switch (alt9) { case 1 : - // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1092:68: '\\'' + // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1098:68: '\\'' { match('\''); @@ -767,11 +789,11 @@ public class InternalNLSDslLexer extends Lexer { try { int _type = RULE_RICH_TEXT_INBETWEEN; int _channel = DEFAULT_TOKEN_CHANNEL; - // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1094:26: ( '\\u00BB' ( RULE_IN_RICH_STRING )* ( '\\'' ( '\\'' )? )? '\\u00AB' ) - // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1094:28: '\\u00BB' ( RULE_IN_RICH_STRING )* ( '\\'' ( '\\'' )? )? '\\u00AB' + // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1100:26: ( '\\u00BB' ( RULE_IN_RICH_STRING )* ( '\\'' ( '\\'' )? )? '\\u00AB' ) + // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1100:28: '\\u00BB' ( RULE_IN_RICH_STRING )* ( '\\'' ( '\\'' )? )? '\\u00AB' { match('\u00BB'); - // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1094:37: ( RULE_IN_RICH_STRING )* + // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1100:37: ( RULE_IN_RICH_STRING )* loop12: do { int alt12=2; @@ -802,7 +824,7 @@ public class InternalNLSDslLexer extends Lexer { switch (alt12) { case 1 : - // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1094:37: RULE_IN_RICH_STRING + // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1100:37: RULE_IN_RICH_STRING { mRULE_IN_RICH_STRING(); @@ -814,7 +836,7 @@ public class InternalNLSDslLexer extends Lexer { } } while (true); - // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1094:58: ( '\\'' ( '\\'' )? )? + // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1100:58: ( '\\'' ( '\\'' )? )? int alt14=2; int LA14_0 = input.LA(1); @@ -823,10 +845,10 @@ public class InternalNLSDslLexer extends Lexer { } switch (alt14) { case 1 : - // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1094:59: '\\'' ( '\\'' )? + // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1100:59: '\\'' ( '\\'' )? { match('\''); - // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1094:64: ( '\\'' )? + // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1100:64: ( '\\'' )? int alt13=2; int LA13_0 = input.LA(1); @@ -835,7 +857,7 @@ public class InternalNLSDslLexer extends Lexer { } switch (alt13) { case 1 : - // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1094:64: '\\'' + // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1100:64: '\\'' { match('\''); @@ -865,10 +887,10 @@ public class InternalNLSDslLexer extends Lexer { // $ANTLR start "RULE_IN_RICH_STRING" public final void mRULE_IN_RICH_STRING() throws RecognitionException { try { - // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1096:30: ( ( '\\'\\'' ~ ( ( '\\u00AB' | '\\'' ) ) | '\\'' ~ ( ( '\\u00AB' | '\\'' ) ) | ~ ( ( '\\u00AB' | '\\'' ) ) ) ) - // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1096:32: ( '\\'\\'' ~ ( ( '\\u00AB' | '\\'' ) ) | '\\'' ~ ( ( '\\u00AB' | '\\'' ) ) | ~ ( ( '\\u00AB' | '\\'' ) ) ) + // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1102:30: ( ( '\\'\\'' ~ ( ( '\\u00AB' | '\\'' ) ) | '\\'' ~ ( ( '\\u00AB' | '\\'' ) ) | ~ ( ( '\\u00AB' | '\\'' ) ) ) ) + // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1102:32: ( '\\'\\'' ~ ( ( '\\u00AB' | '\\'' ) ) | '\\'' ~ ( ( '\\u00AB' | '\\'' ) ) | ~ ( ( '\\u00AB' | '\\'' ) ) ) { - // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1096:32: ( '\\'\\'' ~ ( ( '\\u00AB' | '\\'' ) ) | '\\'' ~ ( ( '\\u00AB' | '\\'' ) ) | ~ ( ( '\\u00AB' | '\\'' ) ) ) + // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1102:32: ( '\\'\\'' ~ ( ( '\\u00AB' | '\\'' ) ) | '\\'' ~ ( ( '\\u00AB' | '\\'' ) ) | ~ ( ( '\\u00AB' | '\\'' ) ) ) int alt15=3; int LA15_0 = input.LA(1); @@ -899,7 +921,7 @@ public class InternalNLSDslLexer extends Lexer { } switch (alt15) { case 1 : - // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1096:33: '\\'\\'' ~ ( ( '\\u00AB' | '\\'' ) ) + // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1102:33: '\\'\\'' ~ ( ( '\\u00AB' | '\\'' ) ) { match("''"); @@ -916,7 +938,7 @@ public class InternalNLSDslLexer extends Lexer { } break; case 2 : - // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1096:59: '\\'' ~ ( ( '\\u00AB' | '\\'' ) ) + // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1102:59: '\\'' ~ ( ( '\\u00AB' | '\\'' ) ) { match('\''); if ( (input.LA(1)>='\u0000' && input.LA(1)<='&')||(input.LA(1)>='(' && input.LA(1)<='\u00AA')||(input.LA(1)>='\u00AC' && input.LA(1)<='\uFFFF') ) { @@ -932,7 +954,7 @@ public class InternalNLSDslLexer extends Lexer { } break; case 3 : - // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1096:83: ~ ( ( '\\u00AB' | '\\'' ) ) + // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1102:83: ~ ( ( '\\u00AB' | '\\'' ) ) { if ( (input.LA(1)>='\u0000' && input.LA(1)<='&')||(input.LA(1)>='(' && input.LA(1)<='\u00AA')||(input.LA(1)>='\u00AC' && input.LA(1)<='\uFFFF') ) { input.consume(); @@ -963,10 +985,10 @@ public class InternalNLSDslLexer extends Lexer { try { int _type = RULE_ID; int _channel = DEFAULT_TOKEN_CHANNEL; - // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1098:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* ) - // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1098:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* + // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1104:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* ) + // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1104:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* { - // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1098:11: ( '^' )? + // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1104:11: ( '^' )? int alt16=2; int LA16_0 = input.LA(1); @@ -975,7 +997,7 @@ public class InternalNLSDslLexer extends Lexer { } switch (alt16) { case 1 : - // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1098:11: '^' + // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1104:11: '^' { match('^'); @@ -993,7 +1015,7 @@ public class InternalNLSDslLexer extends Lexer { recover(mse); throw mse;} - // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1098:40: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* + // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1104:40: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* loop17: do { int alt17=2; @@ -1042,10 +1064,10 @@ public class InternalNLSDslLexer extends Lexer { try { int _type = RULE_INT; int _channel = DEFAULT_TOKEN_CHANNEL; - // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1100:10: ( ( '0' .. '9' )+ ) - // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1100:12: ( '0' .. '9' )+ + // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1106:10: ( ( '0' .. '9' )+ ) + // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1106:12: ( '0' .. '9' )+ { - // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1100:12: ( '0' .. '9' )+ + // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1106:12: ( '0' .. '9' )+ int cnt18=0; loop18: do { @@ -1059,7 +1081,7 @@ public class InternalNLSDslLexer extends Lexer { switch (alt18) { case 1 : - // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1100:13: '0' .. '9' + // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1106:13: '0' .. '9' { matchRange('0','9'); @@ -1091,10 +1113,10 @@ public class InternalNLSDslLexer extends Lexer { try { int _type = RULE_STRING; int _channel = DEFAULT_TOKEN_CHANNEL; - // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1102:13: ( ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) ) - // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1102:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) + // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1108:13: ( ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) ) + // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1108:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) { - // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1102:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) + // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1108:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) int alt21=2; int LA21_0 = input.LA(1); @@ -1112,10 +1134,10 @@ public class InternalNLSDslLexer extends Lexer { } switch (alt21) { case 1 : - // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1102:16: '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' + // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1108:16: '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' { match('\"'); - // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1102:20: ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* + // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1108:20: ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* loop19: do { int alt19=3; @@ -1131,7 +1153,7 @@ public class InternalNLSDslLexer extends Lexer { switch (alt19) { case 1 : - // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1102:21: '\\\\' . + // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1108:21: '\\\\' . { match('\\'); matchAny(); @@ -1139,7 +1161,7 @@ public class InternalNLSDslLexer extends Lexer { } break; case 2 : - // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1102:28: ~ ( ( '\\\\' | '\"' ) ) + // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1108:28: ~ ( ( '\\\\' | '\"' ) ) { if ( (input.LA(1)>='\u0000' && input.LA(1)<='!')||(input.LA(1)>='#' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) { input.consume(); @@ -1164,10 +1186,10 @@ public class InternalNLSDslLexer extends Lexer { } break; case 2 : - // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1102:48: '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' + // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1108:48: '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' { match('\''); - // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1102:53: ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* + // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1108:53: ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* loop20: do { int alt20=3; @@ -1183,7 +1205,7 @@ public class InternalNLSDslLexer extends Lexer { switch (alt20) { case 1 : - // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1102:54: '\\\\' . + // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1108:54: '\\\\' . { match('\\'); matchAny(); @@ -1191,7 +1213,7 @@ public class InternalNLSDslLexer extends Lexer { } break; case 2 : - // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1102:61: ~ ( ( '\\\\' | '\\'' ) ) + // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1108:61: ~ ( ( '\\\\' | '\\'' ) ) { if ( (input.LA(1)>='\u0000' && input.LA(1)<='&')||(input.LA(1)>='(' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) { input.consume(); @@ -1234,12 +1256,12 @@ public class InternalNLSDslLexer extends Lexer { try { int _type = RULE_ML_COMMENT; int _channel = DEFAULT_TOKEN_CHANNEL; - // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1104:17: ( '/*' ( options {greedy=false; } : . )* '*/' ) - // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1104:19: '/*' ( options {greedy=false; } : . )* '*/' + // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1110:17: ( '/*' ( options {greedy=false; } : . )* '*/' ) + // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1110:19: '/*' ( options {greedy=false; } : . )* '*/' { match("/*"); - // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1104:24: ( options {greedy=false; } : . )* + // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1110:24: ( options {greedy=false; } : . )* loop22: do { int alt22=2; @@ -1264,7 +1286,7 @@ public class InternalNLSDslLexer extends Lexer { switch (alt22) { case 1 : - // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1104:52: . + // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1110:52: . { matchAny(); @@ -1294,12 +1316,12 @@ public class InternalNLSDslLexer extends Lexer { try { int _type = RULE_SL_COMMENT; int _channel = DEFAULT_TOKEN_CHANNEL; - // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1106:17: ( '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? ) - // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1106:19: '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? + // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1112:17: ( '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? ) + // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1112:19: '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? { match("//"); - // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1106:24: (~ ( ( '\\n' | '\\r' ) ) )* + // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1112:24: (~ ( ( '\\n' | '\\r' ) ) )* loop23: do { int alt23=2; @@ -1312,7 +1334,7 @@ public class InternalNLSDslLexer extends Lexer { switch (alt23) { case 1 : - // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1106:24: ~ ( ( '\\n' | '\\r' ) ) + // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1112:24: ~ ( ( '\\n' | '\\r' ) ) { if ( (input.LA(1)>='\u0000' && input.LA(1)<='\t')||(input.LA(1)>='\u000B' && input.LA(1)<='\f')||(input.LA(1)>='\u000E' && input.LA(1)<='\uFFFF') ) { input.consume(); @@ -1332,7 +1354,7 @@ public class InternalNLSDslLexer extends Lexer { } } while (true); - // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1106:40: ( ( '\\r' )? '\\n' )? + // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1112:40: ( ( '\\r' )? '\\n' )? int alt25=2; int LA25_0 = input.LA(1); @@ -1341,9 +1363,9 @@ public class InternalNLSDslLexer extends Lexer { } switch (alt25) { case 1 : - // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1106:41: ( '\\r' )? '\\n' + // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1112:41: ( '\\r' )? '\\n' { - // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1106:41: ( '\\r' )? + // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1112:41: ( '\\r' )? int alt24=2; int LA24_0 = input.LA(1); @@ -1352,7 +1374,7 @@ public class InternalNLSDslLexer extends Lexer { } switch (alt24) { case 1 : - // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1106:41: '\\r' + // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1112:41: '\\r' { match('\r'); @@ -1384,10 +1406,10 @@ public class InternalNLSDslLexer extends Lexer { try { int _type = RULE_WS; int _channel = DEFAULT_TOKEN_CHANNEL; - // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1108:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ ) - // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1108:11: ( ' ' | '\\t' | '\\r' | '\\n' )+ + // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1114:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ ) + // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1114:11: ( ' ' | '\\t' | '\\r' | '\\n' )+ { - // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1108:11: ( ' ' | '\\t' | '\\r' | '\\n' )+ + // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1114:11: ( ' ' | '\\t' | '\\r' | '\\n' )+ int cnt26=0; loop26: do { @@ -1441,8 +1463,8 @@ public class InternalNLSDslLexer extends Lexer { try { int _type = RULE_ANY_OTHER; int _channel = DEFAULT_TOKEN_CHANNEL; - // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1110:16: ( . ) - // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1110:18: . + // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1116:16: ( . ) + // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1116:18: . { matchAny(); @@ -1457,8 +1479,8 @@ public class InternalNLSDslLexer extends Lexer { // $ANTLR end "RULE_ANY_OTHER" public void mTokens() throws RecognitionException { - // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1:8: ( T__16 | T__17 | T__18 | T__19 | T__20 | T__21 | T__22 | T__23 | T__24 | T__25 | T__26 | T__27 | T__28 | T__29 | T__30 | T__31 | RULE_RICH_TEXT | RULE_RICH_TEXT_START | RULE_RICH_TEXT_END | RULE_RICH_TEXT_INBETWEEN | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER ) - int alt27=27; + // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1:8: ( T__16 | T__17 | T__18 | T__19 | T__20 | T__21 | T__22 | T__23 | T__24 | T__25 | T__26 | T__27 | T__28 | T__29 | T__30 | T__31 | T__32 | RULE_RICH_TEXT | RULE_RICH_TEXT_START | RULE_RICH_TEXT_END | RULE_RICH_TEXT_INBETWEEN | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER ) + int alt27=28; alt27 = dfa27.predict(input); switch (alt27) { case 1 : @@ -1574,77 +1596,84 @@ public class InternalNLSDslLexer extends Lexer { } break; case 17 : - // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1:106: RULE_RICH_TEXT + // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1:106: T__32 { - mRULE_RICH_TEXT(); + mT__32(); } break; case 18 : - // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1:121: RULE_RICH_TEXT_START + // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1:112: RULE_RICH_TEXT { - mRULE_RICH_TEXT_START(); + mRULE_RICH_TEXT(); } break; case 19 : - // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1:142: RULE_RICH_TEXT_END + // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1:127: RULE_RICH_TEXT_START { - mRULE_RICH_TEXT_END(); + mRULE_RICH_TEXT_START(); } break; case 20 : - // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1:161: RULE_RICH_TEXT_INBETWEEN + // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1:148: RULE_RICH_TEXT_END { - mRULE_RICH_TEXT_INBETWEEN(); + mRULE_RICH_TEXT_END(); } break; case 21 : - // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1:186: RULE_ID + // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1:167: RULE_RICH_TEXT_INBETWEEN { - mRULE_ID(); + mRULE_RICH_TEXT_INBETWEEN(); } break; case 22 : - // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1:194: RULE_INT + // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1:192: RULE_ID { - mRULE_INT(); + mRULE_ID(); } break; case 23 : - // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1:203: RULE_STRING + // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1:200: RULE_INT { - mRULE_STRING(); + mRULE_INT(); } break; case 24 : - // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1:215: RULE_ML_COMMENT + // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1:209: RULE_STRING { - mRULE_ML_COMMENT(); + mRULE_STRING(); } break; case 25 : - // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1:231: RULE_SL_COMMENT + // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1:221: RULE_ML_COMMENT { - mRULE_SL_COMMENT(); + mRULE_ML_COMMENT(); } break; case 26 : - // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1:247: RULE_WS + // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1:237: RULE_SL_COMMENT { - mRULE_WS(); + mRULE_SL_COMMENT(); } break; case 27 : - // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1:255: RULE_ANY_OTHER + // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1:253: RULE_WS + { + mRULE_WS(); + + } + break; + case 28 : + // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1:261: RULE_ANY_OTHER { mRULE_ANY_OTHER(); @@ -1658,25 +1687,25 @@ public class InternalNLSDslLexer extends Lexer { protected DFA27 dfa27 = new DFA27(this); static final String DFA27_eotS = - "\3\uffff\4\35\7\uffff\3\35\1\31\1\57\1\31\2\uffff\2\31\4\uffff\1\35\1\uffff\3\35\7\uffff\3\35\1\54\1\uffff\2\57\6\uffff\4\35\1\103\2\35\1\111\2\57\4\35\1\uffff\1\35\1\120\2\111\2\uffff\1\57\5\35\1\uffff\2\111\1\35\1\132\2\35\1\135\1\111\1\136\1\uffff\1\137\1\35\3\uffff\1\35\1\142\1\uffff"; + "\3\uffff\4\36\7\uffff\4\36\1\32\1\62\1\32\2\uffff\2\32\4\uffff\1\36\1\uffff\3\36\7\uffff\4\36\1\56\1\uffff\2\62\6\uffff\4\36\1\106\3\36\1\115\2\62\4\36\1\uffff\1\36\1\124\1\36\2\115\2\uffff\1\62\5\36\1\uffff\1\36\2\115\1\36\1\140\2\36\1\143\1\36\1\115\1\145\1\uffff\1\146\1\36\1\uffff\1\36\2\uffff\1\36\1\152\1\153\2\uffff"; static final String DFA27_eofS = - "\143\uffff"; + "\154\uffff"; static final String DFA27_minS = - "\1\0\2\uffff\1\141\1\165\1\145\1\157\7\uffff\1\116\1\125\1\101\2\0\1\101\2\uffff\1\0\1\52\4\uffff\1\143\1\uffff\1\156\1\146\1\162\7\uffff\1\131\1\115\1\124\1\47\1\uffff\2\0\6\uffff\1\153\1\144\1\141\1\155\1\60\1\102\1\105\3\0\1\141\1\154\1\165\1\141\1\uffff\1\105\1\60\2\0\2\uffff\1\0\1\147\1\145\1\154\1\164\1\122\1\uffff\2\0\1\145\1\60\2\164\1\60\1\0\1\60\1\uffff\1\60\1\145\3\uffff\1\162\1\60\1\uffff"; + "\1\0\2\uffff\1\141\1\165\1\145\1\157\7\uffff\1\116\1\125\1\101\1\105\2\0\1\101\2\uffff\1\0\1\52\4\uffff\1\143\1\uffff\1\156\1\146\1\162\7\uffff\1\131\1\115\1\124\1\115\1\47\1\uffff\2\0\6\uffff\1\153\1\144\1\141\1\155\1\60\1\102\1\105\1\120\3\0\1\141\1\154\1\165\1\141\1\uffff\1\105\1\60\1\117\2\0\2\uffff\1\0\1\147\1\145\1\154\1\164\1\122\1\uffff\1\122\2\0\1\145\1\60\2\164\1\60\1\101\1\0\1\60\1\uffff\1\60\1\145\1\uffff\1\114\2\uffff\1\162\2\60\2\uffff"; static final String DFA27_maxS = - "\1\uffff\2\uffff\1\141\1\165\1\145\1\157\7\uffff\1\116\1\125\1\101\2\uffff\1\172\2\uffff\1\uffff\1\57\4\uffff\1\143\1\uffff\1\156\1\146\1\162\7\uffff\1\131\1\115\1\124\1\47\1\uffff\2\uffff\6\uffff\1\153\1\144\1\141\1\155\1\172\1\102\1\105\3\uffff\1\141\1\154\1\165\1\141\1\uffff\1\105\1\172\2\uffff\2\uffff\1\uffff\1\147\1\145\1\154\1\164\1\122\1\uffff\2\uffff\1\145\1\172\2\164\1\172\1\uffff\1\172\1\uffff\1\172\1\145\3\uffff\1\162\1\172\1\uffff"; + "\1\uffff\2\uffff\1\141\1\165\1\145\1\157\7\uffff\1\116\1\125\1\101\1\105\2\uffff\1\172\2\uffff\1\uffff\1\57\4\uffff\1\143\1\uffff\1\156\1\146\1\162\7\uffff\1\131\1\115\1\124\1\115\1\47\1\uffff\2\uffff\6\uffff\1\153\1\144\1\141\1\155\1\172\1\102\1\105\1\120\3\uffff\1\141\1\154\1\165\1\141\1\uffff\1\105\1\172\1\117\2\uffff\2\uffff\1\uffff\1\147\1\145\1\154\1\164\1\122\1\uffff\1\122\2\uffff\1\145\1\172\2\164\1\172\1\101\1\uffff\1\172\1\uffff\1\172\1\145\1\uffff\1\114\2\uffff\1\162\2\172\2\uffff"; static final String DFA27_acceptS = - "\1\uffff\1\1\1\2\4\uffff\1\7\1\10\1\11\1\12\1\13\1\14\1\15\6\uffff\1\25\1\26\2\uffff\1\32\1\33\1\1\1\2\1\uffff\1\25\3\uffff\1\7\1\10\1\11\1\12\1\13\1\14\1\15\4\uffff\1\27\2\uffff\1\23\1\24\1\26\1\30\1\31\1\32\16\uffff\1\16\4\uffff\1\22\1\21\6\uffff\1\20\11\uffff\1\4\2\uffff\1\17\1\3\1\5\2\uffff\1\6"; + "\1\uffff\1\1\1\2\4\uffff\1\7\1\10\1\11\1\12\1\13\1\14\1\15\7\uffff\1\26\1\27\2\uffff\1\33\1\34\1\1\1\2\1\uffff\1\26\3\uffff\1\7\1\10\1\11\1\12\1\13\1\14\1\15\5\uffff\1\30\2\uffff\1\25\1\24\1\27\1\31\1\32\1\33\17\uffff\1\16\5\uffff\1\23\1\22\6\uffff\1\20\13\uffff\1\4\2\uffff\1\17\1\uffff\1\3\1\5\3\uffff\1\21\1\6"; static final String DFA27_specialS = - "\1\13\20\uffff\1\15\1\1\3\uffff\1\16\26\uffff\1\0\1\12\15\uffff\1\6\1\3\1\11\7\uffff\1\2\1\7\2\uffff\1\10\6\uffff\1\14\1\5\5\uffff\1\4\12\uffff}>"; + "\1\3\21\uffff\1\6\1\7\3\uffff\1\5\27\uffff\1\1\1\16\16\uffff\1\12\1\0\1\15\10\uffff\1\2\1\13\2\uffff\1\14\7\uffff\1\4\1\11\6\uffff\1\10\15\uffff}>"; static final String[] DFA27_transitionS = { - "\11\31\2\30\2\31\1\30\22\31\1\30\1\31\1\26\4\31\1\21\1\7\1\11\2\31\1\10\1\31\1\15\1\27\12\25\1\12\6\31\1\16\2\24\1\20\11\24\1\17\14\24\1\13\1\31\1\14\1\23\1\24\1\31\1\24\1\4\1\24\1\5\1\24\1\6\11\24\1\3\12\24\1\1\1\31\1\2\75\31\1\22\uff44\31", + "\11\32\2\31\2\32\1\31\22\32\1\31\1\32\1\27\4\32\1\22\1\7\1\11\2\32\1\10\1\32\1\15\1\30\12\26\1\12\6\32\1\16\2\25\1\20\11\25\1\17\5\25\1\21\6\25\1\13\1\32\1\14\1\24\1\25\1\32\1\25\1\4\1\25\1\5\1\25\1\6\11\25\1\3\12\25\1\1\1\32\1\2\75\32\1\23\uff44\32", "", "", - "\1\34", - "\1\36", + "\1\35", "\1\37", "\1\40", + "\1\41", "", "", "", @@ -1684,25 +1713,26 @@ public class InternalNLSDslLexer extends Lexer { "", "", "", - "\1\50", "\1\51", "\1\52", - "\47\54\1\53\uffd8\54", - "\47\56\1\55\u0083\56\1\60\uff54\56", - "\32\35\4\uffff\1\35\1\uffff\32\35", - "", + "\1\53", + "\1\54", + "\47\56\1\55\uffd8\56", + "\47\60\1\57\u0083\60\1\61\uff54\60", + "\32\36\4\uffff\1\36\1\uffff\32\36", "", - "\0\54", - "\1\62\4\uffff\1\63", "", + "\0\56", + "\1\64\4\uffff\1\65", "", "", "", - "\1\65", "", - "\1\66", "\1\67", + "", "\1\70", + "\1\71", + "\1\72", "", "", "", @@ -1710,64 +1740,72 @@ public class InternalNLSDslLexer extends Lexer { "", "", "", - "\1\71", - "\1\72", "\1\73", "\1\74", + "\1\75", + "\1\76", + "\1\77", "", - "\47\76\1\75\u0083\76\1\60\uff54\76", - "\47\56\1\55\u0083\56\1\60\uff54\56", + "\47\101\1\100\u0083\101\1\61\uff54\101", + "\47\60\1\57\u0083\60\1\61\uff54\60", "", "", "", "", "", "", - "\1\77", - "\1\100", - "\1\101", "\1\102", - "\12\35\7\uffff\32\35\4\uffff\1\35\1\uffff\32\35", + "\1\103", "\1\104", "\1\105", - "\47\107\1\106\u0083\107\1\110\uff54\107", - "\47\112\1\uffff\u0083\112\1\60\uff54\112", - "\47\56\1\55\u0083\56\1\60\uff54\56", - "\1\113", - "\1\114", - "\1\115", - "\1\116", - "", + "\12\36\7\uffff\32\36\4\uffff\1\36\1\uffff\32\36", + "\1\107", + "\1\110", + "\1\111", + "\47\113\1\112\u0083\113\1\114\uff54\113", + "\47\116\1\uffff\u0083\116\1\61\uff54\116", + "\47\60\1\57\u0083\60\1\61\uff54\60", "\1\117", - "\12\35\7\uffff\32\35\4\uffff\1\35\1\uffff\32\35", - "\47\122\1\121\u0083\122\1\110\uff54\122", - "\47\107\1\106\u0083\107\1\110\uff54\107", - "", + "\1\120", + "\1\121", + "\1\122", "", - "\47\56\1\55\u0083\56\1\60\uff54\56", "\1\123", - "\1\124", + "\12\36\7\uffff\32\36\4\uffff\1\36\1\uffff\32\36", "\1\125", - "\1\126", - "\1\127", + "\47\127\1\126\u0083\127\1\114\uff54\127", + "\47\113\1\112\u0083\113\1\114\uff54\113", + "", "", - "\47\130\1\uffff\u0083\130\1\110\uff54\130", - "\47\107\1\106\u0083\107\1\110\uff54\107", + "\47\60\1\57\u0083\60\1\61\uff54\60", + "\1\130", "\1\131", - "\12\35\7\uffff\32\35\4\uffff\1\35\1\uffff\32\35", + "\1\132", "\1\133", "\1\134", - "\12\35\7\uffff\32\35\4\uffff\1\35\1\uffff\32\35", - "\47\107\1\106\u0083\107\1\110\uff54\107", - "\12\35\7\uffff\32\35\4\uffff\1\35\1\uffff\32\35", "", - "\12\35\7\uffff\32\35\4\uffff\1\35\1\uffff\32\35", - "\1\140", + "\1\135", + "\47\136\1\uffff\u0083\136\1\114\uff54\136", + "\47\113\1\112\u0083\113\1\114\uff54\113", + "\1\137", + "\12\36\7\uffff\32\36\4\uffff\1\36\1\uffff\32\36", + "\1\141", + "\1\142", + "\12\36\7\uffff\32\36\4\uffff\1\36\1\uffff\32\36", + "\1\144", + "\47\113\1\112\u0083\113\1\114\uff54\113", + "\12\36\7\uffff\32\36\4\uffff\1\36\1\uffff\32\36", "", + "\12\36\7\uffff\32\36\4\uffff\1\36\1\uffff\32\36", + "\1\147", "", + "\1\150", + "", + "", + "\1\151", + "\12\36\7\uffff\32\36\4\uffff\1\36\1\uffff\32\36", + "\12\36\7\uffff\32\36\4\uffff\1\36\1\uffff\32\36", "", - "\1\141", - "\12\35\7\uffff\32\35\4\uffff\1\35\1\uffff\32\35", "" }; @@ -1801,251 +1839,253 @@ public class InternalNLSDslLexer extends Lexer { this.transition = DFA27_transition; } public String getDescription() { - return "1:1: Tokens : ( T__16 | T__17 | T__18 | T__19 | T__20 | T__21 | T__22 | T__23 | T__24 | T__25 | T__26 | T__27 | T__28 | T__29 | T__30 | T__31 | RULE_RICH_TEXT | RULE_RICH_TEXT_START | RULE_RICH_TEXT_END | RULE_RICH_TEXT_INBETWEEN | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER );"; + return "1:1: Tokens : ( T__16 | T__17 | T__18 | T__19 | T__20 | T__21 | T__22 | T__23 | T__24 | T__25 | T__26 | T__27 | T__28 | T__29 | T__30 | T__31 | T__32 | RULE_RICH_TEXT | RULE_RICH_TEXT_START | RULE_RICH_TEXT_END | RULE_RICH_TEXT_INBETWEEN | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER );"; } public int specialStateTransition(int s, IntStream _input) throws NoViableAltException { IntStream input = _input; int _s = s; switch ( s ) { case 0 : - int LA27_45 = input.LA(1); + int LA27_64 = input.LA(1); s = -1; - if ( (LA27_45=='\'') ) {s = 61;} + if ( ((LA27_64>='\u0000' && LA27_64<='&')||(LA27_64>='(' && LA27_64<='\u00AA')||(LA27_64>='\u00AC' && LA27_64<='\uFFFF')) ) {s = 78;} - else if ( ((LA27_45>='\u0000' && LA27_45<='&')||(LA27_45>='(' && LA27_45<='\u00AA')||(LA27_45>='\u00AC' && LA27_45<='\uFFFF')) ) {s = 62;} + else if ( (LA27_64=='\u00AB') ) {s = 49;} - else if ( (LA27_45=='\u00AB') ) {s = 48;} - - else s = 47; + else s = 50; if ( s>=0 ) return s; break; case 1 : - int LA27_18 = input.LA(1); + int LA27_47 = input.LA(1); s = -1; - if ( (LA27_18=='\'') ) {s = 45;} + if ( (LA27_47=='\'') ) {s = 64;} - else if ( ((LA27_18>='\u0000' && LA27_18<='&')||(LA27_18>='(' && LA27_18<='\u00AA')||(LA27_18>='\u00AC' && LA27_18<='\uFFFF')) ) {s = 46;} + else if ( ((LA27_47>='\u0000' && LA27_47<='&')||(LA27_47>='(' && LA27_47<='\u00AA')||(LA27_47>='\u00AC' && LA27_47<='\uFFFF')) ) {s = 65;} - else if ( (LA27_18=='\u00AB') ) {s = 48;} + else if ( (LA27_47=='\u00AB') ) {s = 49;} - else s = 47; + else s = 50; if ( s>=0 ) return s; break; case 2 : - int LA27_70 = input.LA(1); + int LA27_74 = input.LA(1); s = -1; - if ( (LA27_70=='\'') ) {s = 81;} + if ( (LA27_74=='\'') ) {s = 86;} - else if ( ((LA27_70>='\u0000' && LA27_70<='&')||(LA27_70>='(' && LA27_70<='\u00AA')||(LA27_70>='\u00AC' && LA27_70<='\uFFFF')) ) {s = 82;} + else if ( ((LA27_74>='\u0000' && LA27_74<='&')||(LA27_74>='(' && LA27_74<='\u00AA')||(LA27_74>='\u00AC' && LA27_74<='\uFFFF')) ) {s = 87;} - else if ( (LA27_70=='\u00AB') ) {s = 72;} + else if ( (LA27_74=='\u00AB') ) {s = 76;} - else s = 73; + else s = 77; if ( s>=0 ) return s; break; case 3 : - int LA27_61 = input.LA(1); + int LA27_0 = input.LA(1); s = -1; - if ( ((LA27_61>='\u0000' && LA27_61<='&')||(LA27_61>='(' && LA27_61<='\u00AA')||(LA27_61>='\u00AC' && LA27_61<='\uFFFF')) ) {s = 74;} + if ( (LA27_0=='{') ) {s = 1;} - else if ( (LA27_61=='\u00AB') ) {s = 48;} + else if ( (LA27_0=='}') ) {s = 2;} - else s = 47; + else if ( (LA27_0=='p') ) {s = 3;} - if ( s>=0 ) return s; - break; - case 4 : - int LA27_88 = input.LA(1); + else if ( (LA27_0=='b') ) {s = 4;} - s = -1; - if ( (LA27_88=='\'') ) {s = 70;} + else if ( (LA27_0=='d') ) {s = 5;} - else if ( (LA27_88=='\u00AB') ) {s = 72;} + else if ( (LA27_0=='f') ) {s = 6;} - else if ( ((LA27_88>='\u0000' && LA27_88<='&')||(LA27_88>='(' && LA27_88<='\u00AA')||(LA27_88>='\u00AC' && LA27_88<='\uFFFF')) ) {s = 71;} + else if ( (LA27_0=='(') ) {s = 7;} - else s = 73; + else if ( (LA27_0==',') ) {s = 8;} - if ( s>=0 ) return s; - break; - case 5 : - int LA27_82 = input.LA(1); + else if ( (LA27_0==')') ) {s = 9;} - s = -1; - if ( (LA27_82=='\'') ) {s = 70;} + else if ( (LA27_0==':') ) {s = 10;} - else if ( (LA27_82=='\u00AB') ) {s = 72;} + else if ( (LA27_0=='[') ) {s = 11;} - else if ( ((LA27_82>='\u0000' && LA27_82<='&')||(LA27_82>='(' && LA27_82<='\u00AA')||(LA27_82>='\u00AC' && LA27_82<='\uFFFF')) ) {s = 71;} + else if ( (LA27_0==']') ) {s = 12;} - else s = 73; + else if ( (LA27_0=='.') ) {s = 13;} - if ( s>=0 ) return s; - break; - case 6 : - int LA27_60 = input.LA(1); + else if ( (LA27_0=='A') ) {s = 14;} - s = -1; - if ( (LA27_60=='\'') ) {s = 70;} + else if ( (LA27_0=='N') ) {s = 15;} - else if ( ((LA27_60>='\u0000' && LA27_60<='&')||(LA27_60>='(' && LA27_60<='\u00AA')||(LA27_60>='\u00AC' && LA27_60<='\uFFFF')) ) {s = 71;} + else if ( (LA27_0=='D') ) {s = 16;} - else if ( (LA27_60=='\u00AB') ) {s = 72;} + else if ( (LA27_0=='T') ) {s = 17;} - else s = 73; + else if ( (LA27_0=='\'') ) {s = 18;} - if ( s>=0 ) return s; - break; - case 7 : - int LA27_71 = input.LA(1); + else if ( (LA27_0=='\u00BB') ) {s = 19;} - s = -1; - if ( (LA27_71=='\'') ) {s = 70;} + else if ( (LA27_0=='^') ) {s = 20;} + + else if ( ((LA27_0>='B' && LA27_0<='C')||(LA27_0>='E' && LA27_0<='M')||(LA27_0>='O' && LA27_0<='S')||(LA27_0>='U' && LA27_0<='Z')||LA27_0=='_'||LA27_0=='a'||LA27_0=='c'||LA27_0=='e'||(LA27_0>='g' && LA27_0<='o')||(LA27_0>='q' && LA27_0<='z')) ) {s = 21;} + + else if ( ((LA27_0>='0' && LA27_0<='9')) ) {s = 22;} - else if ( ((LA27_71>='\u0000' && LA27_71<='&')||(LA27_71>='(' && LA27_71<='\u00AA')||(LA27_71>='\u00AC' && LA27_71<='\uFFFF')) ) {s = 71;} + else if ( (LA27_0=='\"') ) {s = 23;} - else if ( (LA27_71=='\u00AB') ) {s = 72;} + else if ( (LA27_0=='/') ) {s = 24;} - else s = 73; + else if ( ((LA27_0>='\t' && LA27_0<='\n')||LA27_0=='\r'||LA27_0==' ') ) {s = 25;} + + else if ( ((LA27_0>='\u0000' && LA27_0<='\b')||(LA27_0>='\u000B' && LA27_0<='\f')||(LA27_0>='\u000E' && LA27_0<='\u001F')||LA27_0=='!'||(LA27_0>='#' && LA27_0<='&')||(LA27_0>='*' && LA27_0<='+')||LA27_0=='-'||(LA27_0>=';' && LA27_0<='@')||LA27_0=='\\'||LA27_0=='`'||LA27_0=='|'||(LA27_0>='~' && LA27_0<='\u00BA')||(LA27_0>='\u00BC' && LA27_0<='\uFFFF')) ) {s = 26;} if ( s>=0 ) return s; break; - case 8 : - int LA27_74 = input.LA(1); + case 4 : + int LA27_86 = input.LA(1); s = -1; - if ( (LA27_74=='\'') ) {s = 45;} - - else if ( (LA27_74=='\u00AB') ) {s = 48;} + if ( ((LA27_86>='\u0000' && LA27_86<='&')||(LA27_86>='(' && LA27_86<='\u00AA')||(LA27_86>='\u00AC' && LA27_86<='\uFFFF')) ) {s = 94;} - else if ( ((LA27_74>='\u0000' && LA27_74<='&')||(LA27_74>='(' && LA27_74<='\u00AA')||(LA27_74>='\u00AC' && LA27_74<='\uFFFF')) ) {s = 46;} + else if ( (LA27_86=='\u00AB') ) {s = 76;} - else s = 47; + else s = 77; if ( s>=0 ) return s; break; - case 9 : - int LA27_62 = input.LA(1); + case 5 : + int LA27_23 = input.LA(1); s = -1; - if ( (LA27_62=='\'') ) {s = 45;} - - else if ( ((LA27_62>='\u0000' && LA27_62<='&')||(LA27_62>='(' && LA27_62<='\u00AA')||(LA27_62>='\u00AC' && LA27_62<='\uFFFF')) ) {s = 46;} - - else if ( (LA27_62=='\u00AB') ) {s = 48;} + if ( ((LA27_23>='\u0000' && LA27_23<='\uFFFF')) ) {s = 46;} - else s = 47; + else s = 26; if ( s>=0 ) return s; break; - case 10 : - int LA27_46 = input.LA(1); + case 6 : + int LA27_18 = input.LA(1); s = -1; - if ( (LA27_46=='\'') ) {s = 45;} - - else if ( (LA27_46=='\u00AB') ) {s = 48;} + if ( (LA27_18=='\'') ) {s = 45;} - else if ( ((LA27_46>='\u0000' && LA27_46<='&')||(LA27_46>='(' && LA27_46<='\u00AA')||(LA27_46>='\u00AC' && LA27_46<='\uFFFF')) ) {s = 46;} + else if ( ((LA27_18>='\u0000' && LA27_18<='&')||(LA27_18>='(' && LA27_18<='\uFFFF')) ) {s = 46;} - else s = 47; + else s = 26; if ( s>=0 ) return s; break; - case 11 : - int LA27_0 = input.LA(1); + case 7 : + int LA27_19 = input.LA(1); s = -1; - if ( (LA27_0=='{') ) {s = 1;} + if ( (LA27_19=='\'') ) {s = 47;} - else if ( (LA27_0=='}') ) {s = 2;} + else if ( ((LA27_19>='\u0000' && LA27_19<='&')||(LA27_19>='(' && LA27_19<='\u00AA')||(LA27_19>='\u00AC' && LA27_19<='\uFFFF')) ) {s = 48;} - else if ( (LA27_0=='p') ) {s = 3;} + else if ( (LA27_19=='\u00AB') ) {s = 49;} - else if ( (LA27_0=='b') ) {s = 4;} - - else if ( (LA27_0=='d') ) {s = 5;} + else s = 50; - else if ( (LA27_0=='f') ) {s = 6;} + if ( s>=0 ) return s; + break; + case 8 : + int LA27_94 = input.LA(1); - else if ( (LA27_0=='(') ) {s = 7;} + s = -1; + if ( (LA27_94=='\'') ) {s = 74;} - else if ( (LA27_0==',') ) {s = 8;} + else if ( (LA27_94=='\u00AB') ) {s = 76;} - else if ( (LA27_0==')') ) {s = 9;} + else if ( ((LA27_94>='\u0000' && LA27_94<='&')||(LA27_94>='(' && LA27_94<='\u00AA')||(LA27_94>='\u00AC' && LA27_94<='\uFFFF')) ) {s = 75;} - else if ( (LA27_0==':') ) {s = 10;} + else s = 77; - else if ( (LA27_0=='[') ) {s = 11;} + if ( s>=0 ) return s; + break; + case 9 : + int LA27_87 = input.LA(1); - else if ( (LA27_0==']') ) {s = 12;} + s = -1; + if ( (LA27_87=='\'') ) {s = 74;} - else if ( (LA27_0=='.') ) {s = 13;} + else if ( (LA27_87=='\u00AB') ) {s = 76;} - else if ( (LA27_0=='A') ) {s = 14;} + else if ( ((LA27_87>='\u0000' && LA27_87<='&')||(LA27_87>='(' && LA27_87<='\u00AA')||(LA27_87>='\u00AC' && LA27_87<='\uFFFF')) ) {s = 75;} - else if ( (LA27_0=='N') ) {s = 15;} + else s = 77; - else if ( (LA27_0=='D') ) {s = 16;} + if ( s>=0 ) return s; + break; + case 10 : + int LA27_63 = input.LA(1); - else if ( (LA27_0=='\'') ) {s = 17;} + s = -1; + if ( (LA27_63=='\'') ) {s = 74;} - else if ( (LA27_0=='\u00BB') ) {s = 18;} + else if ( ((LA27_63>='\u0000' && LA27_63<='&')||(LA27_63>='(' && LA27_63<='\u00AA')||(LA27_63>='\u00AC' && LA27_63<='\uFFFF')) ) {s = 75;} - else if ( (LA27_0=='^') ) {s = 19;} + else if ( (LA27_63=='\u00AB') ) {s = 76;} - else if ( ((LA27_0>='B' && LA27_0<='C')||(LA27_0>='E' && LA27_0<='M')||(LA27_0>='O' && LA27_0<='Z')||LA27_0=='_'||LA27_0=='a'||LA27_0=='c'||LA27_0=='e'||(LA27_0>='g' && LA27_0<='o')||(LA27_0>='q' && LA27_0<='z')) ) {s = 20;} + else s = 77; - else if ( ((LA27_0>='0' && LA27_0<='9')) ) {s = 21;} + if ( s>=0 ) return s; + break; + case 11 : + int LA27_75 = input.LA(1); - else if ( (LA27_0=='\"') ) {s = 22;} + s = -1; + if ( (LA27_75=='\'') ) {s = 74;} - else if ( (LA27_0=='/') ) {s = 23;} + else if ( (LA27_75=='\u00AB') ) {s = 76;} - else if ( ((LA27_0>='\t' && LA27_0<='\n')||LA27_0=='\r'||LA27_0==' ') ) {s = 24;} + else if ( ((LA27_75>='\u0000' && LA27_75<='&')||(LA27_75>='(' && LA27_75<='\u00AA')||(LA27_75>='\u00AC' && LA27_75<='\uFFFF')) ) {s = 75;} - else if ( ((LA27_0>='\u0000' && LA27_0<='\b')||(LA27_0>='\u000B' && LA27_0<='\f')||(LA27_0>='\u000E' && LA27_0<='\u001F')||LA27_0=='!'||(LA27_0>='#' && LA27_0<='&')||(LA27_0>='*' && LA27_0<='+')||LA27_0=='-'||(LA27_0>=';' && LA27_0<='@')||LA27_0=='\\'||LA27_0=='`'||LA27_0=='|'||(LA27_0>='~' && LA27_0<='\u00BA')||(LA27_0>='\u00BC' && LA27_0<='\uFFFF')) ) {s = 25;} + else s = 77; if ( s>=0 ) return s; break; case 12 : - int LA27_81 = input.LA(1); + int LA27_78 = input.LA(1); s = -1; - if ( ((LA27_81>='\u0000' && LA27_81<='&')||(LA27_81>='(' && LA27_81<='\u00AA')||(LA27_81>='\u00AC' && LA27_81<='\uFFFF')) ) {s = 88;} + if ( (LA27_78=='\'') ) {s = 47;} - else if ( (LA27_81=='\u00AB') ) {s = 72;} + else if ( ((LA27_78>='\u0000' && LA27_78<='&')||(LA27_78>='(' && LA27_78<='\u00AA')||(LA27_78>='\u00AC' && LA27_78<='\uFFFF')) ) {s = 48;} - else s = 73; + else if ( (LA27_78=='\u00AB') ) {s = 49;} + + else s = 50; if ( s>=0 ) return s; break; case 13 : - int LA27_17 = input.LA(1); + int LA27_65 = input.LA(1); s = -1; - if ( (LA27_17=='\'') ) {s = 43;} + if ( (LA27_65=='\'') ) {s = 47;} + + else if ( (LA27_65=='\u00AB') ) {s = 49;} - else if ( ((LA27_17>='\u0000' && LA27_17<='&')||(LA27_17>='(' && LA27_17<='\uFFFF')) ) {s = 44;} + else if ( ((LA27_65>='\u0000' && LA27_65<='&')||(LA27_65>='(' && LA27_65<='\u00AA')||(LA27_65>='\u00AC' && LA27_65<='\uFFFF')) ) {s = 48;} - else s = 25; + else s = 50; if ( s>=0 ) return s; break; case 14 : - int LA27_22 = input.LA(1); + int LA27_48 = input.LA(1); s = -1; - if ( ((LA27_22>='\u0000' && LA27_22<='\uFFFF')) ) {s = 44;} + if ( (LA27_48=='\'') ) {s = 47;} + + else if ( (LA27_48=='\u00AB') ) {s = 49;} + + else if ( ((LA27_48>='\u0000' && LA27_48<='&')||(LA27_48>='(' && LA27_48<='\u00AA')||(LA27_48>='\u00AC' && LA27_48<='\uFFFF')) ) {s = 48;} - else s = 25; + else s = 50; if ( s>=0 ) return s; break; diff --git a/bundles/tooling/org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDslParser.java b/bundles/tooling/org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDslParser.java index 8a9deb0b6..b74ddba04 100644 --- a/bundles/tooling/org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDslParser.java +++ b/bundles/tooling/org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDslParser.java @@ -23,7 +23,7 @@ import java.util.HashMap; @SuppressWarnings("all") public class InternalNLSDslParser extends AbstractInternalAntlrParser { public static final String[] tokenNames = new String[] { - "<invalid>", "<EOR>", "<DOWN>", "<UP>", "RULE_ID", "RULE_RICH_TEXT", "RULE_RICH_TEXT_START", "RULE_RICH_TEXT_END", "RULE_RICH_TEXT_INBETWEEN", "RULE_STRING", "RULE_IN_RICH_STRING", "RULE_INT", "RULE_ML_COMMENT", "RULE_SL_COMMENT", "RULE_WS", "RULE_ANY_OTHER", "'{'", "'}'", "'package'", "'bundle'", "'default'", "'formatter'", "'('", "','", "')'", "':'", "'['", "']'", "'.'", "'ANY'", "'NUMBER'", "'DATE'" + "<invalid>", "<EOR>", "<DOWN>", "<UP>", "RULE_ID", "RULE_RICH_TEXT", "RULE_RICH_TEXT_START", "RULE_RICH_TEXT_END", "RULE_RICH_TEXT_INBETWEEN", "RULE_STRING", "RULE_IN_RICH_STRING", "RULE_INT", "RULE_ML_COMMENT", "RULE_SL_COMMENT", "RULE_WS", "RULE_ANY_OTHER", "'{'", "'}'", "'package'", "'bundle'", "'default'", "'formatter'", "'('", "','", "')'", "':'", "'['", "']'", "'.'", "'ANY'", "'NUMBER'", "'DATE'", "'TEMPORAL'" }; public static final int RULE_STRING=9; public static final int RULE_SL_COMMENT=13; @@ -35,6 +35,7 @@ public class InternalNLSDslParser extends AbstractInternalAntlrParser { public static final int EOF=-1; public static final int T__30=30; public static final int T__31=31; + public static final int T__32=32; public static final int RULE_RICH_TEXT=5; public static final int RULE_ID=4; public static final int RULE_WS=14; @@ -2839,21 +2840,22 @@ public class InternalNLSDslParser extends AbstractInternalAntlrParser { // $ANTLR start "rulePredefinedTypes" - // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1064:1: rulePredefinedTypes returns [Enumerator current=null] : ( (enumLiteral_0= 'ANY' ) | (enumLiteral_1= 'NUMBER' ) | (enumLiteral_2= 'DATE' ) ) ; + // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1064:1: rulePredefinedTypes returns [Enumerator current=null] : ( (enumLiteral_0= 'ANY' ) | (enumLiteral_1= 'NUMBER' ) | (enumLiteral_2= 'DATE' ) | (enumLiteral_3= 'TEMPORAL' ) ) ; public final Enumerator rulePredefinedTypes() throws RecognitionException { Enumerator current = null; Token enumLiteral_0=null; Token enumLiteral_1=null; Token enumLiteral_2=null; + Token enumLiteral_3=null; enterRule(); try { - // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1066:28: ( ( (enumLiteral_0= 'ANY' ) | (enumLiteral_1= 'NUMBER' ) | (enumLiteral_2= 'DATE' ) ) ) - // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1067:1: ( (enumLiteral_0= 'ANY' ) | (enumLiteral_1= 'NUMBER' ) | (enumLiteral_2= 'DATE' ) ) + // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1066:28: ( ( (enumLiteral_0= 'ANY' ) | (enumLiteral_1= 'NUMBER' ) | (enumLiteral_2= 'DATE' ) | (enumLiteral_3= 'TEMPORAL' ) ) ) + // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1067:1: ( (enumLiteral_0= 'ANY' ) | (enumLiteral_1= 'NUMBER' ) | (enumLiteral_2= 'DATE' ) | (enumLiteral_3= 'TEMPORAL' ) ) { - // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1067:1: ( (enumLiteral_0= 'ANY' ) | (enumLiteral_1= 'NUMBER' ) | (enumLiteral_2= 'DATE' ) ) - int alt16=3; + // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1067:1: ( (enumLiteral_0= 'ANY' ) | (enumLiteral_1= 'NUMBER' ) | (enumLiteral_2= 'DATE' ) | (enumLiteral_3= 'TEMPORAL' ) ) + int alt16=4; switch ( input.LA(1) ) { case 29: { @@ -2870,6 +2872,11 @@ public class InternalNLSDslParser extends AbstractInternalAntlrParser { alt16=3; } break; + case 32: + { + alt16=4; + } + break; default: if (state.backtracking>0) {state.failed=true; return current;} NoViableAltException nvae = @@ -2936,6 +2943,25 @@ public class InternalNLSDslParser extends AbstractInternalAntlrParser { } break; + case 4 : + // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1085:6: (enumLiteral_3= 'TEMPORAL' ) + { + // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1085:6: (enumLiteral_3= 'TEMPORAL' ) + // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1085:8: enumLiteral_3= 'TEMPORAL' + { + enumLiteral_3=(Token)match(input,32,FOLLOW_32_in_rulePredefinedTypes2253); if (state.failed) return current; + if ( state.backtracking==0 ) { + + current = grammarAccess.getPredefinedTypesAccess().getTEMPORALEnumLiteralDeclaration_3().getEnumLiteral().getInstance(); + newLeafNode(enumLiteral_3, grammarAccess.getPredefinedTypesAccess().getTEMPORALEnumLiteralDeclaration_3()); + + } + + } + + + } + break; } @@ -3016,9 +3042,9 @@ public class InternalNLSDslParser extends AbstractInternalAntlrParser { public static final BitSet FOLLOW_ruleMessageEntry_in_entryRuleMessageEntry651 = new BitSet(new long[]{0x0000000000000000L}); public static final BitSet FOLLOW_EOF_in_entryRuleMessageEntry661 = new BitSet(new long[]{0x0000000000000002L}); public static final BitSet FOLLOW_RULE_ID_in_ruleMessageEntry703 = new BitSet(new long[]{0x0000000002400000L}); - public static final BitSet FOLLOW_22_in_ruleMessageEntry721 = new BitSet(new long[]{0x00000000E0000000L}); + public static final BitSet FOLLOW_22_in_ruleMessageEntry721 = new BitSet(new long[]{0x00000001E0000000L}); public static final BitSet FOLLOW_ruleMessageParam_in_ruleMessageEntry742 = new BitSet(new long[]{0x0000000001800000L}); - public static final BitSet FOLLOW_23_in_ruleMessageEntry755 = new BitSet(new long[]{0x00000000E0000000L}); + public static final BitSet FOLLOW_23_in_ruleMessageEntry755 = new BitSet(new long[]{0x00000001E0000000L}); public static final BitSet FOLLOW_ruleMessageParam_in_ruleMessageEntry776 = new BitSet(new long[]{0x0000000001800000L}); public static final BitSet FOLLOW_24_in_ruleMessageEntry790 = new BitSet(new long[]{0x0000000002000000L}); public static final BitSet FOLLOW_25_in_ruleMessageEntry804 = new BitSet(new long[]{0x0000000004010000L}); @@ -3075,6 +3101,7 @@ public class InternalNLSDslParser extends AbstractInternalAntlrParser { public static final BitSet FOLLOW_29_in_rulePredefinedTypes2202 = new BitSet(new long[]{0x0000000000000002L}); public static final BitSet FOLLOW_30_in_rulePredefinedTypes2219 = new BitSet(new long[]{0x0000000000000002L}); public static final BitSet FOLLOW_31_in_rulePredefinedTypes2236 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_32_in_rulePredefinedTypes2253 = new BitSet(new long[]{0x0000000000000002L}); public static final BitSet FOLLOW_28_in_synpred1_InternalNLSDsl2109 = new BitSet(new long[]{0x0000000000000002L}); }
\ No newline at end of file diff --git a/bundles/tooling/org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/services/NLSDslGrammarAccess.java b/bundles/tooling/org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/services/NLSDslGrammarAccess.java index a7fe7407d..34e86b7d0 100644 --- a/bundles/tooling/org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/services/NLSDslGrammarAccess.java +++ b/bundles/tooling/org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/services/NLSDslGrammarAccess.java @@ -585,12 +585,14 @@ public class NLSDslGrammarAccess extends AbstractGrammarElementFinder { private final Keyword cNUMBERNUMBERKeyword_1_0 = (Keyword)cNUMBEREnumLiteralDeclaration_1.eContents().get(0); private final EnumLiteralDeclaration cDATEEnumLiteralDeclaration_2 = (EnumLiteralDeclaration)cAlternatives.eContents().get(2); private final Keyword cDATEDATEKeyword_2_0 = (Keyword)cDATEEnumLiteralDeclaration_2.eContents().get(0); + private final EnumLiteralDeclaration cTEMPORALEnumLiteralDeclaration_3 = (EnumLiteralDeclaration)cAlternatives.eContents().get(3); + private final Keyword cTEMPORALTEMPORALKeyword_3_0 = (Keyword)cTEMPORALEnumLiteralDeclaration_3.eContents().get(0); //enum PredefinedTypes: - // ANY | NUMBER | DATE; + // ANY | NUMBER | DATE | TEMPORAL; public EnumRule getRule() { return rule; } - //ANY | NUMBER | DATE + //ANY | NUMBER | DATE | TEMPORAL public Alternatives getAlternatives() { return cAlternatives; } //ANY @@ -610,6 +612,12 @@ public class NLSDslGrammarAccess extends AbstractGrammarElementFinder { //"DATE" public Keyword getDATEDATEKeyword_2_0() { return cDATEDATEKeyword_2_0; } + + //TEMPORAL + public EnumLiteralDeclaration getTEMPORALEnumLiteralDeclaration_3() { return cTEMPORALEnumLiteralDeclaration_3; } + + //"TEMPORAL" + public Keyword getTEMPORALTEMPORALKeyword_3_0() { return cTEMPORALTEMPORALKeyword_3_0; } } private final NLSElements pNLS; @@ -846,7 +854,7 @@ public class NLSDslGrammarAccess extends AbstractGrammarElementFinder { } //enum PredefinedTypes: - // ANY | NUMBER | DATE; + // ANY | NUMBER | DATE | TEMPORAL; public PredefinedTypesElements getPredefinedTypesAccess() { return unknownRulePredefinedTypes; } diff --git a/bundles/tooling/org.eclipse.fx.ide.l10n/src/org/eclipse/fx/ide/l10n/NLSDsl.xtext b/bundles/tooling/org.eclipse.fx.ide.l10n/src/org/eclipse/fx/ide/l10n/NLSDsl.xtext index f0896891a..1dc06a334 100644 --- a/bundles/tooling/org.eclipse.fx.ide.l10n/src/org/eclipse/fx/ide/l10n/NLSDsl.xtext +++ b/bundles/tooling/org.eclipse.fx.ide.l10n/src/org/eclipse/fx/ide/l10n/NLSDsl.xtext @@ -73,7 +73,7 @@ QualifiedName: ValidID (=>'.' ValidID)*; enum PredefinedTypes : - ANY | NUMBER | DATE + ANY | NUMBER | DATE | TEMPORAL ; terminal RICH_TEXT : "'''" IN_RICH_STRING* ("'''"| ("'" "'"?)? EOF); diff --git a/bundles/tooling/org.eclipse.fx.ide.l10n/src/org/eclipse/fx/ide/l10n/generator/NLSDslGenerator.xtend b/bundles/tooling/org.eclipse.fx.ide.l10n/src/org/eclipse/fx/ide/l10n/generator/NLSDslGenerator.xtend index 67f4e0be0..aca1014de 100644 --- a/bundles/tooling/org.eclipse.fx.ide.l10n/src/org/eclipse/fx/ide/l10n/generator/NLSDslGenerator.xtend +++ b/bundles/tooling/org.eclipse.fx.ide.l10n/src/org/eclipse/fx/ide/l10n/generator/NLSDslGenerator.xtend @@ -51,6 +51,9 @@ class NLSDslGenerator implements IGenerator { def genClass(NLSBundle nls, NLS root) ''' package «root.package.name»; + /* + * Do not modify - Auto generated from «root.eResource.URI.lastSegment» + */ public class «nls.name» { «FOR me : nls.messageEntryList.filter[m|m.entryRef == null]» public String «me.name»; @@ -61,31 +64,28 @@ class NLSDslGenerator implements IGenerator { def genRegistryClass(NLSBundle nls, NLS root) ''' package «root.package.name»; - import org.eclipse.fx.core.di.text.AbstractMessageRegistry; - import org.eclipse.fx.core.text.Formatter; - - import org.eclipse.e4.core.di.annotations.Creatable; - - import java.util.function.Supplier; - - import javax.inject.Inject; - - import org.eclipse.e4.core.services.nls.Translation; - - @Creatable - public class «nls.name»Registry extends AbstractMessageRegistry<«nls.name»> { + /* + * Do not modify - Auto generated from «root.eResource.URI.lastSegment» + */ + @org.eclipse.e4.core.di.annotations.Creatable + public class «nls.name»Registry extends org.eclipse.fx.core.di.text.AbstractMessageRegistry<«nls.name»> { «IF nls.eAllContents.filter(typeof(RichVarPart)).findFirst[p|p.findFormatter == "-number"] != null» - @Inject + @javax.inject.Inject private org.eclipse.fx.core.di.text.NumberFormatter _number; «ENDIF» «IF nls.eAllContents.filter(typeof(RichVarPart)).findFirst[p|p.findFormatter == "-date"] != null» - @Inject + @javax.inject.Inject private org.eclipse.fx.core.di.text.DateFormatter _date; «ENDIF» + «IF nls.eAllContents.filter(typeof(RichVarPart)).findFirst[p|p.findFormatter == "-temporal"] != null» + @javax.inject.Inject + private org.eclipse.fx.core.di.text.TemporalAccessorFormatter _temporal; + «ENDIF» + «FOR f : nls.formatterList» - @Inject + @javax.inject.Inject private «f.classRef» cust_«f.name»; «ENDFOR» @@ -93,12 +93,12 @@ class NLSDslGenerator implements IGenerator { s.add(e.entryRef.findNLSBundle) return s ])» - @Inject + @javax.inject.Inject private «(b.eContainer as NLS).package.name».«b.name»Registry bundle_«b.name»; «ENDFOR» - @Inject - public void updateMessages(@Translation «nls.name» messages) { + @javax.inject.Inject + public void updateMessages(@org.eclipse.e4.core.services.nls.Translation «nls.name» messages) { super.updateMessages(messages); } @@ -121,7 +121,7 @@ class NLSDslGenerator implements IGenerator { dataMap.put("«p.^var»",«p.^var»); «ENDFOR» «IF me.messageList.head.message.expressions.filter(typeof(RichVarPart)).findFirst[p|p.format!= null] != null» - java.util.Map<String,Formatter<?>> formatterMap = new java.util.HashMap<>(); + java.util.Map<String,org.eclipse.fx.core.text.Formatter<?>> formatterMap = new java.util.HashMap<>(); «FOR o : me.messageList.head.message.expressions.filter(typeof(RichVarPart)).filter[p|p.format != null].map[findFormatter].fold(new HashSet,[ s,p | s.add(p) return s @@ -132,6 +132,8 @@ class NLSDslGenerator implements IGenerator { formatterMap.put("«o»",_date); «ELSEIF o == "-number"» formatterMap.put("«o»",_number); + «ELSEIF o == "-temporal"» + formatterMap.put("«o»",_temporal); «ELSE» formatterMap.put("«o»",cust_«o»); «ENDIF» @@ -143,7 +145,7 @@ class NLSDslGenerator implements IGenerator { «ENDIF» } - public Supplier<String> «me.name»_supplier(«me.paramList.map[p|p.predefined.toSourceString + " " + p.^var].join(", ")») { + public java.util.function.Supplier<String> «me.name»_supplier(«me.paramList.map[p|p.predefined.toSourceString + " " + p.^var].join(", ")») { return () -> «me.name»(«me.paramList.map[p|p.^var].join(", ")»); } «ENDIF» @@ -152,21 +154,22 @@ class NLSDslGenerator implements IGenerator { } ''' -// def formattedValue(MessageParam p) { -// -// } - def toSourceString(PredefinedTypes t) { if( t == PredefinedTypes::ANY ) { return "Object" } else if( t == PredefinedTypes::DATE ) { return "java.util.Date" + } else if( t == PredefinedTypes::TEMPORAL ) { + return "java.time.temporal.TemporalAccessor"; } else { return "Number" } } def genPropertyFile(NLSBundle nls, String lang) ''' + # + # Do not modify - Auto generated from «nls.eResource.URI.lastSegment» + # «FOR e : nls.messageEntryList.filter[m|m.messageList.findFirst[mm|mm.name == lang] != null]» «e.name» = «e.messageList.findFirst[m|m.name == lang].message.toText» «ENDFOR» @@ -196,6 +199,7 @@ class NLSDslGenerator implements IGenerator { switch(p.findMessageEntry.paramList.findFirst[param|param.^var == p.key].predefined) { case DATE: return "-date" case NUMBER: return "-number" + case TEMPORAL: return "-temporal" default: return "-default" } } |