From eeacfd1927fee2edf43a11ee816fe5b506f0feab Mon Sep 17 00:00:00 2001 From: ipa-nhg Date: Tue, 23 Mar 2021 16:04:08 +0100 Subject: [PATCH] Merge simplified version of the ROS DSL grammar --- .../antlr/internal/InternalRos.tokens | 2 +- .../antlr/internal/InternalRosLexer.java | 379 +++++++++--------- .../antlr/internal/InternalRosParser.java | 18 +- .../de/fraunhofer/ipa/ros/Ros.xtextbin | Bin 15876 -> 15877 bytes .../parser/antlr/internal/InternalRos.tokens | 2 +- .../antlr/internal/InternalRosLexer.java | 371 ++++++++--------- .../antlr/internal/InternalRosParser.java | 16 +- .../ros/serializer/RosSemanticSequencer.java | 31 +- .../ipa/ros/services/RosGrammarAccess.java | 335 +++++++++++----- 9 files changed, 639 insertions(+), 515 deletions(-) diff --git a/plugins/de.fraunhofer.ipa.ros.xtext.ide/src-gen/de/fraunhofer/ipa/ros/ide/contentassist/antlr/internal/InternalRos.tokens b/plugins/de.fraunhofer.ipa.ros.xtext.ide/src-gen/de/fraunhofer/ipa/ros/ide/contentassist/antlr/internal/InternalRos.tokens index a044352e9..78e1740bb 100644 --- a/plugins/de.fraunhofer.ipa.ros.xtext.ide/src-gen/de/fraunhofer/ipa/ros/ide/contentassist/antlr/internal/InternalRos.tokens +++ b/plugins/de.fraunhofer.ipa.ros.xtext.ide/src-gen/de/fraunhofer/ipa/ros/ide/contentassist/antlr/internal/InternalRos.tokens @@ -36,7 +36,7 @@ 'ServiceSpec'=49 'Specs'=45 'String'=28 -'Struc'=77 +'Struct'=77 'Subscriber'=65 'Subscribers'=57 'TopicSpec'=52 diff --git a/plugins/de.fraunhofer.ipa.ros.xtext.ide/src-gen/de/fraunhofer/ipa/ros/ide/contentassist/antlr/internal/InternalRosLexer.java b/plugins/de.fraunhofer.ipa.ros.xtext.ide/src-gen/de/fraunhofer/ipa/ros/ide/contentassist/antlr/internal/InternalRosLexer.java index 07ede15e8..d57da0165 100644 --- a/plugins/de.fraunhofer.ipa.ros.xtext.ide/src-gen/de/fraunhofer/ipa/ros/ide/contentassist/antlr/internal/InternalRosLexer.java +++ b/plugins/de.fraunhofer.ipa.ros.xtext.ide/src-gen/de/fraunhofer/ipa/ros/ide/contentassist/antlr/internal/InternalRosLexer.java @@ -1230,10 +1230,10 @@ public final void mT__77() throws RecognitionException { try { int _type = T__77; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRos.g:63:7: ( 'Struc' ) - // InternalRos.g:63:9: 'Struc' + // InternalRos.g:63:7: ( 'Struct' ) + // InternalRos.g:63:9: 'Struct' { - match("Struc"); + match("Struct"); } @@ -4251,17 +4251,17 @@ public String getDescription() { } } static final String DFA30_eotS = - "\1\44\16\61\3\uffff\16\61\3\55\1\61\1\uffff\3\55\2\156\1\55\1\156\2\uffff\3\61\2\uffff\31\61\3\uffff\22\61\4\uffff\1\61\2\uffff\1\u00a5\2\uffff\1\u00a5\4\uffff\3\156\1\uffff\60\61\3\uffff\2\156\2\61\1\u00e1\1\u00e3\6\61\1\u00ea\12\61\1\u00f5\1\u00f6\1\u00f7\16\61\1\u0106\3\61\1\u010a\3\61\1\u010f\1\u0111\1\u0113\4\61\1\156\2\61\1\uffff\1\61\1\uffff\2\61\1\u0120\1\u0121\2\61\1\uffff\6\61\1\u00f7\1\u012b\2\61\3\uffff\10\61\1\u0136\5\61\1\uffff\1\61\1\u013d\1\61\1\uffff\3\61\6\uffff\1\u0143\1\u0145\1\u0147\1\u0149\6\61\1\u0150\1\u0151\2\uffff\3\61\1\u0155\5\61\1\uffff\1\61\1\u015d\1\u015e\7\61\1\uffff\3\61\1\u016a\2\61\1\uffff\3\61\1\u0170\10\uffff\1\u0172\1\u0174\1\u0176\3\61\2\uffff\2\61\1\u017d\1\uffff\1\61\1\u017f\1\61\1\u0182\1\u0184\1\u0185\3\uffff\1\61\1\u0187\1\u018a\10\61\1\uffff\3\61\1\u0197\1\u0198\7\uffff\6\61\1\uffff\1\u01a0\1\uffff\1\u01a1\5\uffff\1\u01a2\1\uffff\2\61\1\uffff\3\61\1\u01a8\10\61\2\uffff\1\u01b1\1\61\1\u01b3\4\61\3\uffff\2\61\1\u01bd\1\u01bf\1\61\1\uffff\5\61\1\u01c6\2\61\1\uffff\1\61\1\uffff\3\61\1\u01ce\1\u01cf\1\61\1\u01d1\2\61\1\uffff\1\u01d4\1\uffff\1\61\1\u01d6\4\61\1\uffff\3\61\1\u01de\2\61\1\u01e1\2\uffff\1\61\1\uffff\2\61\1\uffff\1\61\1\uffff\7\61\1\uffff\2\61\1\uffff\1\61\1\u01f0\2\61\1\u01f4\1\u01f6\1\61\1\u01f8\3\61\1\u01fd\1\u01ff\1\61\1\uffff\2\61\1\u0203\1\uffff\1\u0204\1\uffff\1\u0205\1\uffff\3\61\1\u0209\1\uffff\1\u020a\1\uffff\3\61\3\uffff\2\61\1\u0210\2\uffff\5\61\1\uffff\2\61\1\u0218\2\61\1\u021b\1\61\1\uffff\1\61\1\u021e\1\uffff\1\61\1\u0220\1\uffff\1\61\1\uffff\1\61\1\u0223\1\uffff"; + "\1\44\16\61\3\uffff\16\61\3\55\1\61\1\uffff\3\55\2\156\1\55\1\156\2\uffff\3\61\2\uffff\31\61\3\uffff\22\61\4\uffff\1\61\2\uffff\1\u00a5\2\uffff\1\u00a5\4\uffff\3\156\1\uffff\60\61\3\uffff\2\156\2\61\1\u00e1\1\u00e3\6\61\1\u00ea\12\61\1\u00f5\1\u00f6\1\u00f7\16\61\1\u0106\3\61\1\u010a\3\61\1\u010f\1\u0111\1\u0113\4\61\1\156\2\61\1\uffff\1\61\1\uffff\3\61\1\u0121\2\61\1\uffff\6\61\1\u00f7\1\u012b\2\61\3\uffff\10\61\1\u0136\5\61\1\uffff\1\61\1\u013d\1\61\1\uffff\3\61\6\uffff\1\u0143\1\u0145\1\u0147\1\u0149\6\61\1\u0150\1\u0151\1\u0152\1\uffff\3\61\1\u0156\5\61\1\uffff\1\61\1\u015e\1\u015f\7\61\1\uffff\3\61\1\u016b\2\61\1\uffff\3\61\1\u0171\10\uffff\1\u0173\1\u0175\1\u0177\3\61\3\uffff\2\61\1\u017e\1\uffff\1\61\1\u0180\1\61\1\u0183\1\u0185\1\u0186\3\uffff\1\61\1\u0188\1\u018b\10\61\1\uffff\3\61\1\u0198\1\u0199\7\uffff\6\61\1\uffff\1\u01a1\1\uffff\1\u01a2\5\uffff\1\u01a3\1\uffff\2\61\1\uffff\3\61\1\u01a9\10\61\2\uffff\1\u01b2\1\61\1\u01b4\4\61\3\uffff\2\61\1\u01be\1\u01c0\1\61\1\uffff\5\61\1\u01c7\2\61\1\uffff\1\61\1\uffff\3\61\1\u01cf\1\u01d0\1\61\1\u01d2\2\61\1\uffff\1\u01d5\1\uffff\1\61\1\u01d7\4\61\1\uffff\3\61\1\u01df\2\61\1\u01e2\2\uffff\1\61\1\uffff\2\61\1\uffff\1\61\1\uffff\7\61\1\uffff\2\61\1\uffff\1\61\1\u01f1\2\61\1\u01f5\1\u01f7\1\61\1\u01f9\3\61\1\u01fe\1\u0200\1\61\1\uffff\2\61\1\u0204\1\uffff\1\u0205\1\uffff\1\u0206\1\uffff\3\61\1\u020a\1\uffff\1\u020b\1\uffff\3\61\3\uffff\2\61\1\u0211\2\uffff\5\61\1\uffff\2\61\1\u0219\2\61\1\u021c\1\61\1\uffff\1\61\1\u021f\1\uffff\1\61\1\u0221\1\uffff\1\61\1\uffff\1\61\1\u0224\1\uffff"; static final String DFA30_eofS = - "\u0224\uffff"; + "\u0225\uffff"; static final String DFA30_minS = - "\1\0\16\57\3\uffff\16\57\1\135\1\42\1\101\1\57\1\uffff\2\0\1\42\2\56\1\60\1\56\2\uffff\3\57\2\uffff\31\57\3\uffff\22\57\4\uffff\1\57\2\0\1\57\2\0\1\57\4\uffff\3\56\1\uffff\60\57\1\0\1\uffff\1\0\2\56\65\57\1\55\2\57\1\uffff\1\57\1\uffff\6\57\1\uffff\12\57\3\uffff\16\57\1\uffff\3\57\1\uffff\3\57\6\uffff\14\57\2\uffff\11\57\1\uffff\12\57\1\uffff\6\57\1\uffff\4\57\10\uffff\6\57\2\uffff\3\57\1\uffff\6\57\3\uffff\13\57\1\uffff\5\57\7\uffff\6\57\1\uffff\1\57\1\uffff\1\57\5\uffff\1\57\1\uffff\2\57\1\uffff\14\57\2\uffff\7\57\3\uffff\5\57\1\uffff\10\57\1\uffff\1\57\1\uffff\11\57\1\uffff\1\57\1\uffff\6\57\1\uffff\7\57\2\uffff\1\57\1\uffff\2\57\1\uffff\1\57\1\uffff\7\57\1\uffff\2\57\1\uffff\16\57\1\uffff\3\57\1\uffff\1\57\1\uffff\1\57\1\uffff\4\57\1\uffff\1\57\1\uffff\3\57\3\uffff\3\57\2\uffff\5\57\1\uffff\7\57\1\uffff\2\57\1\uffff\2\57\1\uffff\1\57\1\uffff\2\57\1\uffff"; + "\1\0\16\57\3\uffff\16\57\1\135\1\42\1\101\1\57\1\uffff\2\0\1\42\2\56\1\60\1\56\2\uffff\3\57\2\uffff\31\57\3\uffff\22\57\4\uffff\1\57\2\0\1\57\2\0\1\57\4\uffff\3\56\1\uffff\60\57\1\0\1\uffff\1\0\2\56\65\57\1\55\2\57\1\uffff\1\57\1\uffff\6\57\1\uffff\12\57\3\uffff\16\57\1\uffff\3\57\1\uffff\3\57\6\uffff\15\57\1\uffff\11\57\1\uffff\12\57\1\uffff\6\57\1\uffff\4\57\10\uffff\6\57\3\uffff\3\57\1\uffff\6\57\3\uffff\13\57\1\uffff\5\57\7\uffff\6\57\1\uffff\1\57\1\uffff\1\57\5\uffff\1\57\1\uffff\2\57\1\uffff\14\57\2\uffff\7\57\3\uffff\5\57\1\uffff\10\57\1\uffff\1\57\1\uffff\11\57\1\uffff\1\57\1\uffff\6\57\1\uffff\7\57\2\uffff\1\57\1\uffff\2\57\1\uffff\1\57\1\uffff\7\57\1\uffff\2\57\1\uffff\16\57\1\uffff\3\57\1\uffff\1\57\1\uffff\1\57\1\uffff\4\57\1\uffff\1\57\1\uffff\3\57\3\uffff\3\57\2\uffff\5\57\1\uffff\7\57\1\uffff\2\57\1\uffff\2\57\1\uffff\1\57\1\uffff\2\57\1\uffff"; static final String DFA30_maxS = - "\1\uffff\16\172\3\uffff\16\172\1\135\3\172\1\uffff\2\uffff\1\47\2\145\1\71\1\145\2\uffff\3\172\2\uffff\31\172\3\uffff\22\172\4\uffff\1\172\2\uffff\1\75\2\uffff\1\75\4\uffff\3\145\1\uffff\60\172\1\uffff\1\uffff\1\uffff\2\145\65\172\1\145\2\172\1\uffff\1\172\1\uffff\6\172\1\uffff\12\172\3\uffff\16\172\1\uffff\3\172\1\uffff\3\172\6\uffff\14\172\2\uffff\11\172\1\uffff\12\172\1\uffff\6\172\1\uffff\4\172\10\uffff\6\172\2\uffff\3\172\1\uffff\6\172\3\uffff\13\172\1\uffff\5\172\7\uffff\6\172\1\uffff\1\172\1\uffff\1\172\5\uffff\1\172\1\uffff\2\172\1\uffff\14\172\2\uffff\7\172\3\uffff\5\172\1\uffff\10\172\1\uffff\1\172\1\uffff\11\172\1\uffff\1\172\1\uffff\6\172\1\uffff\7\172\2\uffff\1\172\1\uffff\2\172\1\uffff\1\172\1\uffff\7\172\1\uffff\2\172\1\uffff\16\172\1\uffff\3\172\1\uffff\1\172\1\uffff\1\172\1\uffff\4\172\1\uffff\1\172\1\uffff\3\172\3\uffff\3\172\2\uffff\5\172\1\uffff\7\172\1\uffff\2\172\1\uffff\2\172\1\uffff\1\172\1\uffff\2\172\1\uffff"; + "\1\uffff\16\172\3\uffff\16\172\1\135\3\172\1\uffff\2\uffff\1\47\2\145\1\71\1\145\2\uffff\3\172\2\uffff\31\172\3\uffff\22\172\4\uffff\1\172\2\uffff\1\75\2\uffff\1\75\4\uffff\3\145\1\uffff\60\172\1\uffff\1\uffff\1\uffff\2\145\65\172\1\145\2\172\1\uffff\1\172\1\uffff\6\172\1\uffff\12\172\3\uffff\16\172\1\uffff\3\172\1\uffff\3\172\6\uffff\15\172\1\uffff\11\172\1\uffff\12\172\1\uffff\6\172\1\uffff\4\172\10\uffff\6\172\3\uffff\3\172\1\uffff\6\172\3\uffff\13\172\1\uffff\5\172\7\uffff\6\172\1\uffff\1\172\1\uffff\1\172\5\uffff\1\172\1\uffff\2\172\1\uffff\14\172\2\uffff\7\172\3\uffff\5\172\1\uffff\10\172\1\uffff\1\172\1\uffff\11\172\1\uffff\1\172\1\uffff\6\172\1\uffff\7\172\2\uffff\1\172\1\uffff\2\172\1\uffff\1\172\1\uffff\7\172\1\uffff\2\172\1\uffff\16\172\1\uffff\3\172\1\uffff\1\172\1\uffff\1\172\1\uffff\4\172\1\uffff\1\172\1\uffff\3\172\3\uffff\3\172\2\uffff\5\172\1\uffff\7\172\1\uffff\2\172\1\uffff\2\172\1\uffff\1\172\1\uffff\2\172\1\uffff"; static final String DFA30_acceptS = - "\17\uffff\1\21\1\22\1\23\22\uffff\1\131\7\uffff\1\145\1\146\3\uffff\1\141\1\140\31\uffff\1\21\1\22\1\23\22\uffff\1\130\1\143\1\144\1\132\7\uffff\1\133\1\137\1\136\1\135\3\uffff\1\145\61\uffff\1\142\73\uffff\1\2\1\uffff\1\11\6\uffff\1\5\12\uffff\1\14\1\17\1\134\16\uffff\1\36\3\uffff\1\64\3\uffff\1\113\1\76\1\127\1\112\1\114\1\77\14\uffff\1\65\1\25\11\uffff\1\12\12\uffff\1\73\6\uffff\1\60\4\uffff\1\116\1\101\1\120\1\103\1\122\1\105\1\115\1\100\6\uffff\1\3\1\4\3\uffff\1\7\6\uffff\1\126\1\111\1\15\13\uffff\1\70\5\uffff\1\72\1\117\1\102\1\121\1\104\1\123\1\106\6\uffff\1\6\1\uffff\1\32\1\uffff\1\124\1\107\1\125\1\110\1\13\1\uffff\1\67\2\uffff\1\24\14\uffff\1\66\1\71\7\uffff\1\33\1\10\1\16\5\uffff\1\26\10\uffff\1\1\1\uffff\1\47\11\uffff\1\63\1\uffff\1\50\6\uffff\1\34\7\uffff\1\51\1\20\1\uffff\1\45\2\uffff\1\40\1\uffff\1\35\7\uffff\1\31\2\uffff\1\41\16\uffff\1\74\3\uffff\1\53\1\uffff\1\54\1\uffff\1\30\4\uffff\1\46\1\uffff\1\52\3\uffff\1\43\1\44\1\27\3\uffff\1\37\1\42\5\uffff\1\57\7\uffff\1\62\2\uffff\1\55\2\uffff\1\61\1\uffff\1\56\2\uffff\1\75"; + "\17\uffff\1\21\1\22\1\23\22\uffff\1\131\7\uffff\1\145\1\146\3\uffff\1\141\1\140\31\uffff\1\21\1\22\1\23\22\uffff\1\130\1\143\1\144\1\132\7\uffff\1\133\1\137\1\136\1\135\3\uffff\1\145\61\uffff\1\142\73\uffff\1\2\1\uffff\1\11\6\uffff\1\5\12\uffff\1\14\1\17\1\134\16\uffff\1\36\3\uffff\1\64\3\uffff\1\113\1\76\1\127\1\112\1\114\1\77\15\uffff\1\25\11\uffff\1\12\12\uffff\1\73\6\uffff\1\60\4\uffff\1\116\1\101\1\120\1\103\1\122\1\105\1\115\1\100\6\uffff\1\3\1\4\1\65\3\uffff\1\7\6\uffff\1\126\1\111\1\15\13\uffff\1\70\5\uffff\1\72\1\117\1\102\1\121\1\104\1\123\1\106\6\uffff\1\6\1\uffff\1\32\1\uffff\1\124\1\107\1\125\1\110\1\13\1\uffff\1\67\2\uffff\1\24\14\uffff\1\66\1\71\7\uffff\1\33\1\10\1\16\5\uffff\1\26\10\uffff\1\1\1\uffff\1\47\11\uffff\1\63\1\uffff\1\50\6\uffff\1\34\7\uffff\1\51\1\20\1\uffff\1\45\2\uffff\1\40\1\uffff\1\35\7\uffff\1\31\2\uffff\1\41\16\uffff\1\74\3\uffff\1\53\1\uffff\1\54\1\uffff\1\30\4\uffff\1\46\1\uffff\1\52\3\uffff\1\43\1\44\1\27\3\uffff\1\37\1\42\5\uffff\1\57\7\uffff\1\62\2\uffff\1\55\2\uffff\1\61\1\uffff\1\56\2\uffff\1\75"; static final String DFA30_specialS = - "\1\2\44\uffff\1\5\1\10\77\uffff\1\3\1\7\1\uffff\1\4\1\1\71\uffff\1\6\1\uffff\1\0\u017d\uffff}>"; + "\1\5\44\uffff\1\4\1\10\77\uffff\1\2\1\7\1\uffff\1\3\1\1\71\uffff\1\6\1\uffff\1\0\u017e\uffff}>"; static final String[] DFA30_transitionS = { "\11\55\2\54\2\55\1\54\22\55\1\54\1\55\1\45\4\55\1\46\4\55\1\21\1\52\1\55\1\41\1\50\2\51\7\53\7\55\1\22\1\34\1\23\1\24\1\27\1\43\1\1\1\3\1\33\2\43\1\32\1\43\1\26\1\43\1\16\1\43\1\31\1\4\1\25\6\43\1\40\2\55\1\42\1\43\1\55\1\14\1\35\1\43\1\15\1\43\1\10\1\5\1\43\1\36\3\43\1\6\1\2\1\43\1\30\1\43\1\7\1\12\1\13\1\37\1\11\4\43\1\17\1\55\1\20\1\47\uff81\55", "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\13\60\1\57\5\60\1\56\10\60", @@ -4493,7 +4493,7 @@ public String getDescription() { "", "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\21\60\1\u011e\10\60", "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\6\60\1\u011f\23\60", - "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\32\60", + "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\23\60\1\u0120\6\60", "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\32\60", "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\2\60\1\u0122\27\60", "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\21\60\1\u0123\10\60", @@ -4551,39 +4551,39 @@ public String getDescription() { "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\1\u014f\31\60", "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\32\60", "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\32\60", + "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\32\60", "", - "", - "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\4\60\1\u0152\25\60", - "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\10\60\1\u0153\21\60", - "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\4\60\1\u0154\25\60", + "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\4\60\1\u0153\25\60", + "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\10\60\1\u0154\21\60", + "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\4\60\1\u0155\25\60", "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\32\60", - "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\22\60\1\u0156\7\60", - "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\23\60\1\u0157\6\60", - "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\2\60\1\u0158\27\60", - "\1\44\2\60\1\u0159\7\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\32\60", - "\1\44\4\60\1\u015a\5\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\32\60", + "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\22\60\1\u0157\7\60", + "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\23\60\1\u0158\6\60", + "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\2\60\1\u0159\27\60", + "\1\44\2\60\1\u015a\7\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\32\60", + "\1\44\4\60\1\u015b\5\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\32\60", "", - "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\4\60\1\u015b\25\60", - "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\1\u015c\3\uffff\1\60\1\uffff\32\60", + "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\4\60\1\u015c\25\60", + "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\1\u015d\3\uffff\1\60\1\uffff\32\60", "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\32\60", - "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\16\60\1\u015f\13\60", - "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\23\60\1\u0160\6\60", - "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\4\60\1\u0161\25\60", - "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\23\60\1\u0162\6\60", - "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\7\60\1\u0163\22\60", - "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\4\60\1\u0164\25\60", - "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\2\60\1\u0165\27\60", + "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\16\60\1\u0160\13\60", + "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\23\60\1\u0161\6\60", + "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\4\60\1\u0162\25\60", + "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\23\60\1\u0163\6\60", + "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\7\60\1\u0164\22\60", + "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\4\60\1\u0165\25\60", + "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\2\60\1\u0166\27\60", "", - "\1\44\12\60\3\uffff\1\62\3\uffff\2\60\1\u0167\17\60\1\u0166\7\60\4\uffff\1\60\1\uffff\32\60", - "\1\44\12\60\3\uffff\1\62\3\uffff\17\60\1\u0168\12\60\4\uffff\1\60\1\uffff\32\60", - "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\4\60\1\u0169\25\60", + "\1\44\12\60\3\uffff\1\62\3\uffff\2\60\1\u0168\17\60\1\u0167\7\60\4\uffff\1\60\1\uffff\32\60", + "\1\44\12\60\3\uffff\1\62\3\uffff\17\60\1\u0169\12\60\4\uffff\1\60\1\uffff\32\60", + "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\4\60\1\u016a\25\60", "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\32\60", - "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\17\60\1\u016b\12\60", - "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\1\u016c\31\60", + "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\17\60\1\u016c\12\60", + "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\1\u016d\31\60", "", - "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\25\60\1\u016d\4\60", - "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\21\60\1\u016e\10\60", - "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\15\60\1\u016f\14\60", + "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\25\60\1\u016e\4\60", + "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\21\60\1\u016f\10\60", + "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\15\60\1\u0170\14\60", "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\32\60", "", "", @@ -4593,42 +4593,43 @@ public String getDescription() { "", "", "", - "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\1\u0171\3\uffff\1\60\1\uffff\32\60", - "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\1\u0173\3\uffff\1\60\1\uffff\32\60", - "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\1\u0175\3\uffff\1\60\1\uffff\32\60", - "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\14\60\1\u0177\15\60", - "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\1\u0178\31\60", - "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\2\60\1\u0179\27\60", + "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\1\u0172\3\uffff\1\60\1\uffff\32\60", + "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\1\u0174\3\uffff\1\60\1\uffff\32\60", + "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\1\u0176\3\uffff\1\60\1\uffff\32\60", + "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\14\60\1\u0178\15\60", + "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\1\u0179\31\60", + "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\2\60\1\u017a\27\60", + "", "", "", - "\1\44\12\60\3\uffff\1\62\3\uffff\2\60\1\u017b\17\60\1\u017a\7\60\4\uffff\1\60\1\uffff\32\60", - "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\1\60\1\u017c\30\60", + "\1\44\12\60\3\uffff\1\62\3\uffff\2\60\1\u017c\17\60\1\u017b\7\60\4\uffff\1\60\1\uffff\32\60", + "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\1\60\1\u017d\30\60", "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\32\60", "", - "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\4\60\1\u017e\25\60", + "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\4\60\1\u017f\25\60", "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\32\60", - "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\12\60\1\u0180\17\60", - "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\1\u0181\3\uffff\1\60\1\uffff\32\60", - "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\1\u0183\3\uffff\1\60\1\uffff\32\60", + "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\12\60\1\u0181\17\60", + "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\1\u0182\3\uffff\1\60\1\uffff\32\60", + "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\1\u0184\3\uffff\1\60\1\uffff\32\60", "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\32\60", "", "", "", - "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\15\60\1\u0186\14\60", + "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\15\60\1\u0187\14\60", "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\32\60", - "\1\44\12\60\3\uffff\1\62\3\uffff\3\60\1\u0189\16\60\1\u0188\7\60\4\uffff\1\60\1\uffff\32\60", - "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\4\60\1\u018b\25\60", + "\1\44\12\60\3\uffff\1\62\3\uffff\3\60\1\u018a\16\60\1\u0189\7\60\4\uffff\1\60\1\uffff\32\60", "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\4\60\1\u018c\25\60", - "\1\44\12\60\3\uffff\1\62\3\uffff\15\60\1\u018d\14\60\4\uffff\1\60\1\uffff\32\60", - "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\23\60\1\u018e\6\60", - "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\4\60\1\u0190\12\60\1\u018f\12\60", - "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\13\60\1\u0191\16\60", - "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\1\u0192\31\60", - "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\15\60\1\u0193\14\60", + "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\4\60\1\u018d\25\60", + "\1\44\12\60\3\uffff\1\62\3\uffff\15\60\1\u018e\14\60\4\uffff\1\60\1\uffff\32\60", + "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\23\60\1\u018f\6\60", + "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\4\60\1\u0191\12\60\1\u0190\12\60", + "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\13\60\1\u0192\16\60", + "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\1\u0193\31\60", + "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\15\60\1\u0194\14\60", "", - "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\4\60\1\u0194\25\60", - "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\13\60\1\u0195\16\60", - "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\4\60\1\u0196\25\60", + "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\4\60\1\u0195\25\60", + "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\13\60\1\u0196\16\60", + "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\4\60\1\u0197\25\60", "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\32\60", "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\32\60", "", @@ -4638,12 +4639,12 @@ public String getDescription() { "", "", "", - "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\4\60\1\u0199\25\60", - "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\14\60\1\u019a\15\60", - "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\4\60\1\u019b\25\60", - "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\4\60\1\u019d\12\60\1\u019c\12\60", - "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\13\60\1\u019e\16\60", - "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\4\60\1\u019f\25\60", + "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\4\60\1\u019a\25\60", + "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\14\60\1\u019b\15\60", + "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\4\60\1\u019c\25\60", + "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\4\60\1\u019e\12\60\1\u019d\12\60", + "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\13\60\1\u019f\16\60", + "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\4\60\1\u01a0\25\60", "", "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\32\60", "", @@ -4655,160 +4656,160 @@ public String getDescription() { "", "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\32\60", "", - "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\4\60\1\u01a3\25\60", "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\4\60\1\u01a4\25\60", + "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\4\60\1\u01a5\25\60", "", - "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\21\60\1\u01a5\10\60", "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\21\60\1\u01a6\10\60", - "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\1\u01a7\31\60", + "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\21\60\1\u01a7\10\60", + "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\1\u01a8\31\60", "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\32\60", - "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\4\60\1\u01a9\25\60", - "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\21\60\1\u01aa\10\60", - "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\10\60\1\u01ab\21\60", - "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\2\60\1\u01ac\27\60", + "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\4\60\1\u01aa\25\60", + "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\21\60\1\u01ab\10\60", + "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\10\60\1\u01ac\21\60", "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\2\60\1\u01ad\27\60", "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\2\60\1\u01ae\27\60", - "\1\44\12\60\3\uffff\1\62\3\uffff\3\60\1\u01af\26\60\4\uffff\1\60\1\uffff\32\60", - "\1\44\12\60\3\uffff\1\62\3\uffff\15\60\1\u01b0\14\60\4\uffff\1\60\1\uffff\32\60", + "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\2\60\1\u01af\27\60", + "\1\44\12\60\3\uffff\1\62\3\uffff\3\60\1\u01b0\26\60\4\uffff\1\60\1\uffff\32\60", + "\1\44\12\60\3\uffff\1\62\3\uffff\15\60\1\u01b1\14\60\4\uffff\1\60\1\uffff\32\60", "", "", "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\32\60", - "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\4\60\1\u01b2\25\60", + "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\4\60\1\u01b3\25\60", "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\32\60", - "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\4\60\1\u01b4\25\60", - "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\21\60\1\u01b5\10\60", - "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\10\60\1\u01b6\21\60", - "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\21\60\1\u01b7\10\60", + "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\4\60\1\u01b5\25\60", + "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\21\60\1\u01b6\10\60", + "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\10\60\1\u01b7\21\60", + "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\21\60\1\u01b8\10\60", "", "", "", - "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\23\60\1\u01b8\6\60", - "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\17\60\1\u01b9\12\60", - "\1\44\12\60\3\uffff\1\62\3\uffff\1\u01bb\21\60\1\u01bc\7\60\4\uffff\1\60\1\uffff\22\60\1\u01ba\7\60", - "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\22\60\1\u01be\7\60", - "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\14\60\1\u01c0\15\60", + "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\23\60\1\u01b9\6\60", + "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\17\60\1\u01ba\12\60", + "\1\44\12\60\3\uffff\1\62\3\uffff\1\u01bc\21\60\1\u01bd\7\60\4\uffff\1\60\1\uffff\22\60\1\u01bb\7\60", + "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\22\60\1\u01bf\7\60", + "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\14\60\1\u01c1\15\60", "", - "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\2\60\1\u01c1\27\60", - "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\25\60\1\u01c2\4\60", - "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\4\60\1\u01c3\25\60", - "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\12\60\1\u01c4\17\60", - "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\10\60\1\u01c5\21\60", + "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\2\60\1\u01c2\27\60", + "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\25\60\1\u01c3\4\60", + "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\4\60\1\u01c4\25\60", + "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\12\60\1\u01c5\17\60", + "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\10\60\1\u01c6\21\60", "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\32\60", - "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\4\60\1\u01c7\25\60", - "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\1\u01c8\31\60", + "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\4\60\1\u01c8\25\60", + "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\1\u01c9\31\60", "", - "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\22\60\1\u01c9\7\60", + "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\22\60\1\u01ca\7\60", "", - "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\2\60\1\u01ca\27\60", - "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\25\60\1\u01cb\4\60", - "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\4\60\1\u01cc\25\60", - "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\22\60\1\u01cd\7\60", + "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\2\60\1\u01cb\27\60", + "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\25\60\1\u01cc\4\60", + "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\4\60\1\u01cd\25\60", + "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\22\60\1\u01ce\7\60", "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\32\60", - "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\4\60\1\u01d0\25\60", + "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\4\60\1\u01d1\25\60", "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\32\60", - "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\15\60\1\u01d2\14\60", - "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\23\60\1\u01d3\6\60", + "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\15\60\1\u01d3\14\60", + "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\23\60\1\u01d4\6\60", "", "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\32\60", "", - "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\4\60\1\u01d5\25\60", + "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\4\60\1\u01d6\25\60", "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\32\60", - "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\4\60\1\u01d7\25\60", - "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\15\60\1\u01d8\14\60", - "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\1\u01d9\31\60", - "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\4\60\1\u01da\25\60", + "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\4\60\1\u01d8\25\60", + "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\15\60\1\u01d9\14\60", + "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\1\u01da\31\60", + "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\4\60\1\u01db\25\60", "", - "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\17\60\1\u01db\12\60", - "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\14\60\1\u01dc\15\60", - "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\17\60\1\u01dd\12\60", + "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\17\60\1\u01dc\12\60", + "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\14\60\1\u01dd\15\60", + "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\17\60\1\u01de\12\60", "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\32\60", - "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\4\60\1\u01df\25\60", - "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\15\60\1\u01e0\14\60", + "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\4\60\1\u01e0\25\60", + "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\15\60\1\u01e1\14\60", "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\32\60", "", "", - "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\15\60\1\u01e2\14\60", + "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\15\60\1\u01e3\14\60", "", - "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\30\60\1\u01e3\1\60", - "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\21\60\1\u01e4\10\60", + "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\30\60\1\u01e4\1\60", + "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\21\60\1\u01e5\10\60", "", - "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\22\60\1\u01e5\7\60", + "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\22\60\1\u01e6\7\60", "", - "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\21\60\1\u01e6\10\60", - "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\23\60\1\u01e7\6\60", - "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\6\60\1\u01e8\23\60", - "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\22\60\1\u01e9\7\60", - "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\4\60\1\u01ea\25\60", + "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\21\60\1\u01e7\10\60", + "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\23\60\1\u01e8\6\60", + "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\6\60\1\u01e9\23\60", + "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\22\60\1\u01ea\7\60", "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\4\60\1\u01eb\25\60", - "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\1\u01ec\31\60", + "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\4\60\1\u01ec\25\60", + "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\1\u01ed\31\60", "", - "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\21\60\1\u01ed\10\60", - "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\23\60\1\u01ee\6\60", + "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\21\60\1\u01ee\10\60", + "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\23\60\1\u01ef\6\60", "", - "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\3\60\1\u01ef\26\60", + "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\3\60\1\u01f0\26\60", "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\32\60", - "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\24\60\1\u01f1\5\60", - "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\17\60\1\u01f2\12\60", - "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\22\60\1\u01f3\7\60", - "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\22\60\1\u01f5\7\60", - "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\4\60\1\u01f7\25\60", + "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\24\60\1\u01f2\5\60", + "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\17\60\1\u01f3\12\60", + "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\22\60\1\u01f4\7\60", + "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\22\60\1\u01f6\7\60", + "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\4\60\1\u01f8\25\60", "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\32\60", - "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\15\60\1\u01f9\14\60", - "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\22\60\1\u01fa\7\60", - "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\2\60\1\u01fb\27\60", - "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\22\60\1\u01fc\7\60", - "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\22\60\1\u01fe\7\60", - "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\4\60\1\u0200\25\60", + "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\15\60\1\u01fa\14\60", + "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\22\60\1\u01fb\7\60", + "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\2\60\1\u01fc\27\60", + "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\22\60\1\u01fd\7\60", + "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\22\60\1\u01ff\7\60", + "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\4\60\1\u0201\25\60", "", - "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\2\60\1\u0201\27\60", - "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\1\u0202\31\60", + "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\2\60\1\u0202\27\60", + "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\1\u0203\31\60", "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\32\60", "", "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\32\60", "", "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\32\60", "", - "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\3\60\1\u0206\26\60", - "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\17\60\1\u0207\12\60", - "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\4\60\1\u0208\25\60", + "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\3\60\1\u0207\26\60", + "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\17\60\1\u0208\12\60", + "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\4\60\1\u0209\25\60", "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\32\60", "", "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\32\60", "", - "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\15\60\1\u020b\14\60", - "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\23\60\1\u020c\6\60", - "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\2\60\1\u020d\27\60", + "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\15\60\1\u020c\14\60", + "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\23\60\1\u020d\6\60", + "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\2\60\1\u020e\27\60", "", "", "", - "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\4\60\1\u020e\25\60", - "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\1\u020f\31\60", + "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\4\60\1\u020f\25\60", + "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\1\u0210\31\60", "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\32\60", "", "", - "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\2\60\1\u0211\27\60", - "\1\44\12\60\3\uffff\1\62\3\uffff\14\60\1\u0212\15\60\4\uffff\1\60\1\uffff\32\60", - "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\4\60\1\u0213\25\60", - "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\15\60\1\u0214\14\60", - "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\2\60\1\u0215\27\60", + "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\2\60\1\u0212\27\60", + "\1\44\12\60\3\uffff\1\62\3\uffff\14\60\1\u0213\15\60\4\uffff\1\60\1\uffff\32\60", + "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\4\60\1\u0214\25\60", + "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\15\60\1\u0215\14\60", + "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\2\60\1\u0216\27\60", "", - "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\30\60\1\u0216\1\60", - "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\4\60\1\u0217\25\60", + "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\30\60\1\u0217\1\60", + "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\4\60\1\u0218\25\60", "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\32\60", - "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\2\60\1\u0219\27\60", - "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\4\60\1\u021a\25\60", + "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\2\60\1\u021a\27\60", + "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\4\60\1\u021b\25\60", "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\32\60", - "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\14\60\1\u021c\15\60", + "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\14\60\1\u021d\15\60", "", - "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\30\60\1\u021d\1\60", + "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\30\60\1\u021e\1\60", "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\32\60", "", - "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\1\60\1\u021f\30\60", + "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\1\60\1\u0220\30\60", "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\32\60", "", - "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\4\60\1\u0221\25\60", + "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\4\60\1\u0222\25\60", "", - "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\21\60\1\u0222\10\60", + "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\21\60\1\u0223\10\60", "\1\44\12\60\3\uffff\1\62\3\uffff\32\60\4\uffff\1\60\1\uffff\32\60", "" }; @@ -4874,6 +4875,36 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc if ( s>=0 ) return s; break; case 2 : + int LA30_102 = input.LA(1); + + s = -1; + if ( ((LA30_102>='\u0000' && LA30_102<='\uFFFF')) ) {s = 164;} + + if ( s>=0 ) return s; + break; + case 3 : + int LA30_105 = input.LA(1); + + s = -1; + if ( ((LA30_105>='\u0000' && LA30_105<='\uFFFF')) ) {s = 166;} + + if ( s>=0 ) return s; + break; + case 4 : + int LA30_37 = input.LA(1); + + s = -1; + if ( (LA30_37=='\\') ) {s = 102;} + + else if ( ((LA30_37>='\u0000' && LA30_37<='!')||(LA30_37>='#' && LA30_37<='[')||(LA30_37>=']' && LA30_37<='\uFFFF')) ) {s = 103;} + + else if ( (LA30_37=='\"') ) {s = 104;} + + else s = 45; + + if ( s>=0 ) return s; + break; + case 5 : int LA30_0 = input.LA(1); s = -1; @@ -4967,36 +4998,6 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc else s = 36; - if ( s>=0 ) return s; - break; - case 3 : - int LA30_102 = input.LA(1); - - s = -1; - if ( ((LA30_102>='\u0000' && LA30_102<='\uFFFF')) ) {s = 164;} - - if ( s>=0 ) return s; - break; - case 4 : - int LA30_105 = input.LA(1); - - s = -1; - if ( ((LA30_105>='\u0000' && LA30_105<='\uFFFF')) ) {s = 166;} - - if ( s>=0 ) return s; - break; - case 5 : - int LA30_37 = input.LA(1); - - s = -1; - if ( (LA30_37=='\\') ) {s = 102;} - - else if ( ((LA30_37>='\u0000' && LA30_37<='!')||(LA30_37>='#' && LA30_37<='[')||(LA30_37>=']' && LA30_37<='\uFFFF')) ) {s = 103;} - - else if ( (LA30_37=='\"') ) {s = 104;} - - else s = 45; - if ( s>=0 ) return s; break; case 6 : @@ -5046,4 +5047,4 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc } -} +} \ No newline at end of file diff --git a/plugins/de.fraunhofer.ipa.ros.xtext.ide/src-gen/de/fraunhofer/ipa/ros/ide/contentassist/antlr/internal/InternalRosParser.java b/plugins/de.fraunhofer.ipa.ros.xtext.ide/src-gen/de/fraunhofer/ipa/ros/ide/contentassist/antlr/internal/InternalRosParser.java index a1e93accf..c711745ea 100644 --- a/plugins/de.fraunhofer.ipa.ros.xtext.ide/src-gen/de/fraunhofer/ipa/ros/ide/contentassist/antlr/internal/InternalRosParser.java +++ b/plugins/de.fraunhofer.ipa.ros.xtext.ide/src-gen/de/fraunhofer/ipa/ros/ide/contentassist/antlr/internal/InternalRosParser.java @@ -22,7 +22,7 @@ @SuppressWarnings("all") public class InternalRosParser extends AbstractInternalContentAssistParser { public static final String[] tokenNames = new String[] { - "", "", "", "", "RULE_BINARY", "RULE_BOOLEAN", "RULE_DOUBLE", "RULE_DECINT", "RULE_DATE_TIME", "RULE_STRING", "RULE_ID", "RULE_ROS_CONVENTION_A", "RULE_MESSAGE_ASIGMENT", "RULE_ROS_CONVENTION_PARAM", "RULE_DIGIT", "RULE_DAY", "RULE_MONTH", "RULE_YEAR", "RULE_HOUR", "RULE_MIN_SEC", "RULE_INT", "RULE_ML_COMMENT", "RULE_SL_COMMENT", "RULE_WS", "RULE_ANY_OTHER", "'GraphName'", "'node'", "'Header'", "'String'", "'goal'", "'message'", "'result'", "'feedback'", "'name'", "'value'", "'service'", "'type'", "'action'", "'duration'", "'time'", "'PackageSet'", "'{'", "'}'", "','", "'Package'", "'Specs'", "'Artifact'", "'CatkinPackage'", "'Dependencies'", "'ServiceSpec'", "'request'", "'response'", "'TopicSpec'", "'ActionSpec'", "'Node'", "'ServiceServers'", "'Publishers'", "'Subscribers'", "'ServiceClients'", "'ActionServers'", "'ActionClients'", "'Parameters'", "'ServiceServer'", "'namespace'", "'Publisher'", "'Subscriber'", "'ServiceClient'", "'ActionServer'", "'ActionClient'", "'PackageDependency'", "'ExternalDependency'", "'GlobalNamespace'", "'parts'", "'RelativeNamespace'", "'PrivateNamespace'", "'Parameter'", "'List'", "'Struc'", "'Integer'", "'default'", "'Double'", "'Boolean'", "'Base64'", "'Array'", "'ParameterAny'", "'ParameterStructMember'", "'bool'", "'int8'", "'uint8'", "'int16'", "'uint16'", "'int32'", "'uint32'", "'int64'", "'uint64'", "'float32'", "'float64'", "'string'", "'byte'", "'bool[]'", "'int8[]'", "'uint8[]'", "'int16[]'", "'uint16[]'", "'int32[]'", "'uint32[]'", "'int64[]'", "'uint64[]'", "'float32[]'", "'float64[]'", "'string[]'", "'byte[]'", "'[]'" + "", "", "", "", "RULE_BINARY", "RULE_BOOLEAN", "RULE_DOUBLE", "RULE_DECINT", "RULE_DATE_TIME", "RULE_STRING", "RULE_ID", "RULE_ROS_CONVENTION_A", "RULE_MESSAGE_ASIGMENT", "RULE_ROS_CONVENTION_PARAM", "RULE_DIGIT", "RULE_DAY", "RULE_MONTH", "RULE_YEAR", "RULE_HOUR", "RULE_MIN_SEC", "RULE_INT", "RULE_ML_COMMENT", "RULE_SL_COMMENT", "RULE_WS", "RULE_ANY_OTHER", "'GraphName'", "'node'", "'Header'", "'String'", "'goal'", "'message'", "'result'", "'feedback'", "'name'", "'value'", "'service'", "'type'", "'action'", "'duration'", "'time'", "'PackageSet'", "'{'", "'}'", "','", "'Package'", "'Specs'", "'Artifact'", "'CatkinPackage'", "'Dependencies'", "'ServiceSpec'", "'request'", "'response'", "'TopicSpec'", "'ActionSpec'", "'Node'", "'ServiceServers'", "'Publishers'", "'Subscribers'", "'ServiceClients'", "'ActionServers'", "'ActionClients'", "'Parameters'", "'ServiceServer'", "'namespace'", "'Publisher'", "'Subscriber'", "'ServiceClient'", "'ActionServer'", "'ActionClient'", "'PackageDependency'", "'ExternalDependency'", "'GlobalNamespace'", "'parts'", "'RelativeNamespace'", "'PrivateNamespace'", "'Parameter'", "'List'", "'Struct'", "'Integer'", "'default'", "'Double'", "'Boolean'", "'Base64'", "'Array'", "'ParameterAny'", "'ParameterStructMember'", "'bool'", "'int8'", "'uint8'", "'int16'", "'uint16'", "'int32'", "'uint32'", "'int64'", "'uint64'", "'float32'", "'float64'", "'string'", "'byte'", "'bool[]'", "'int8[]'", "'uint8[]'", "'int16[]'", "'uint16[]'", "'int32[]'", "'uint32[]'", "'int64[]'", "'uint64[]'", "'float32[]'", "'float64[]'", "'string[]'", "'byte[]'", "'[]'" }; public static final int T__50=50; public static final int RULE_DATE_TIME=8; @@ -31440,21 +31440,21 @@ public final void rule__ParameterStructType__Group__1() throws RecognitionExcept // $ANTLR start "rule__ParameterStructType__Group__1__Impl" - // InternalRos.g:10373:1: rule__ParameterStructType__Group__1__Impl : ( 'Struc' ) ; + // InternalRos.g:10373:1: rule__ParameterStructType__Group__1__Impl : ( 'Struct' ) ; public final void rule__ParameterStructType__Group__1__Impl() throws RecognitionException { int stackSize = keepStackSize(); try { - // InternalRos.g:10377:1: ( ( 'Struc' ) ) - // InternalRos.g:10378:1: ( 'Struc' ) + // InternalRos.g:10377:1: ( ( 'Struct' ) ) + // InternalRos.g:10378:1: ( 'Struct' ) { - // InternalRos.g:10378:1: ( 'Struc' ) - // InternalRos.g:10379:2: 'Struc' + // InternalRos.g:10378:1: ( 'Struct' ) + // InternalRos.g:10379:2: 'Struct' { - before(grammarAccess.getParameterStructTypeAccess().getStrucKeyword_1()); + before(grammarAccess.getParameterStructTypeAccess().getStructKeyword_1()); match(input,77,FOLLOW_2); - after(grammarAccess.getParameterStructTypeAccess().getStrucKeyword_1()); + after(grammarAccess.getParameterStructTypeAccess().getStructKeyword_1()); } @@ -46790,4 +46790,4 @@ public String getDescription() { public static final BitSet FOLLOW_97 = new BitSet(new long[]{0x0000000008000000L}); public static final BitSet FOLLOW_98 = new BitSet(new long[]{0x0000000000000000L,0x0001000000000000L}); -} +} \ No newline at end of file diff --git a/plugins/de.fraunhofer.ipa.ros.xtext/src-gen/de/fraunhofer/ipa/ros/Ros.xtextbin b/plugins/de.fraunhofer.ipa.ros.xtext/src-gen/de/fraunhofer/ipa/ros/Ros.xtextbin index bf33865d4d943d3569b4c45b4f648d9d2414726f..591e24ea90d6661e703a4eea3861b2af104de124 100644 GIT binary patch delta 20 bcmZpvX|36CRh^wZxTL5wxn%Qgbxkn"; + "\1\5\44\uffff\1\4\1\10\77\uffff\1\2\1\7\1\uffff\1\3\1\1\71\uffff\1\6\1\uffff\1\0\u017e\uffff}>"; static final String[] DFA30_transitionS = { "\11\55\2\54\2\55\1\54\22\55\1\54\1\55\1\45\4\55\1\46\4\55\1\3\1\52\1\55\1\41\1\50\2\51\7\53\7\55\1\7\1\33\1\10\1\11\1\24\1\43\1\23\1\14\1\31\2\43\1\30\1\43\1\20\1\43\1\1\1\43\1\26\1\5\1\13\6\43\1\40\2\55\1\42\1\43\1\55\1\22\1\35\1\43\1\32\1\43\1\17\1\16\1\43\1\36\3\43\1\15\1\6\1\43\1\25\1\43\1\12\1\21\1\27\1\37\1\34\4\43\1\2\1\55\1\4\1\47\uff81\55", "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\1\56\20\61\1\60\2\61\1\57\5\61", @@ -4493,7 +4493,7 @@ public String getDescription() { "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\32\61", "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\2\61\1\u0120\27\61", "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\6\61\1\u0121\23\61", - "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\32\61", + "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\23\61\1\u0122\6\61", "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\21\61\1\u0123\10\61", "", "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\17\61\1\u0124\12\61", @@ -4553,36 +4553,36 @@ public String getDescription() { "", "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\4\61\1\u0151\25\61", "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\32\61", + "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\32\61", + "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\10\61\1\u0154\21\61", + "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\1\u0155\31\61", + "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\2\61\1\u0156\27\61", "", - "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\10\61\1\u0153\21\61", - "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\1\u0154\31\61", - "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\2\61\1\u0155\27\61", - "", - "\1\44\12\61\3\uffff\1\63\3\uffff\2\61\1\u0157\17\61\1\u0156\7\61\4\uffff\1\61\1\uffff\32\61", - "\1\44\12\61\3\uffff\1\63\3\uffff\17\61\1\u0158\12\61\4\uffff\1\61\1\uffff\32\61", - "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\4\61\1\u0159\25\61", + "\1\44\12\61\3\uffff\1\63\3\uffff\2\61\1\u0158\17\61\1\u0157\7\61\4\uffff\1\61\1\uffff\32\61", + "\1\44\12\61\3\uffff\1\63\3\uffff\17\61\1\u0159\12\61\4\uffff\1\61\1\uffff\32\61", + "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\4\61\1\u015a\25\61", "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\32\61", - "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\23\61\1\u015b\6\61", - "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\22\61\1\u015c\7\61", + "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\23\61\1\u015c\6\61", + "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\22\61\1\u015d\7\61", "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\32\61", - "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\17\61\1\u015e\12\61", + "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\17\61\1\u015f\12\61", "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\32\61", - "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\4\61\1\u0160\25\61", - "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\2\61\1\u0161\27\61", - "\1\44\2\61\1\u0162\7\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\32\61", - "\1\44\4\61\1\u0163\5\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\32\61", - "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\4\61\1\u0164\25\61", - "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\1\u0165\3\uffff\1\61\1\uffff\32\61", + "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\4\61\1\u0161\25\61", + "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\2\61\1\u0162\27\61", + "\1\44\2\61\1\u0163\7\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\32\61", + "\1\44\4\61\1\u0164\5\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\32\61", + "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\4\61\1\u0165\25\61", + "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\1\u0166\3\uffff\1\61\1\uffff\32\61", "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\32\61", - "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\1\u0168\31\61", - "\1\44\12\61\3\uffff\1\63\3\uffff\15\61\1\u0169\14\61\4\uffff\1\61\1\uffff\32\61", - "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\1\u016a\31\61", + "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\1\u0169\31\61", + "\1\44\12\61\3\uffff\1\63\3\uffff\15\61\1\u016a\14\61\4\uffff\1\61\1\uffff\32\61", + "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\1\u016b\31\61", "", - "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\25\61\1\u016b\4\61", - "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\21\61\1\u016c\10\61", - "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\23\61\1\u016d\6\61", - "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\16\61\1\u016e\13\61", - "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\15\61\1\u016f\14\61", + "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\25\61\1\u016c\4\61", + "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\21\61\1\u016d\10\61", + "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\23\61\1\u016e\6\61", + "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\16\61\1\u016f\13\61", + "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\15\61\1\u0170\14\61", "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\32\61", "", "", @@ -4593,43 +4593,44 @@ public String getDescription() { "", "", "", - "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\1\u0171\3\uffff\1\61\1\uffff\32\61", - "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\1\u0173\3\uffff\1\61\1\uffff\32\61", - "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\1\u0175\3\uffff\1\61\1\uffff\32\61", - "\1\44\12\61\3\uffff\1\63\3\uffff\3\61\1\u0178\16\61\1\u0177\7\61\4\uffff\1\61\1\uffff\32\61", - "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\4\61\1\u017a\25\61", + "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\1\u0172\3\uffff\1\61\1\uffff\32\61", + "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\1\u0174\3\uffff\1\61\1\uffff\32\61", + "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\1\u0176\3\uffff\1\61\1\uffff\32\61", + "\1\44\12\61\3\uffff\1\63\3\uffff\3\61\1\u0179\16\61\1\u0178\7\61\4\uffff\1\61\1\uffff\32\61", "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\4\61\1\u017b\25\61", - "\1\44\12\61\3\uffff\1\63\3\uffff\15\61\1\u017c\14\61\4\uffff\1\61\1\uffff\32\61", - "\1\44\12\61\3\uffff\1\63\3\uffff\2\61\1\u017e\17\61\1\u017d\7\61\4\uffff\1\61\1\uffff\32\61", + "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\4\61\1\u017c\25\61", + "\1\44\12\61\3\uffff\1\63\3\uffff\15\61\1\u017d\14\61\4\uffff\1\61\1\uffff\32\61", + "\1\44\12\61\3\uffff\1\63\3\uffff\2\61\1\u017f\17\61\1\u017e\7\61\4\uffff\1\61\1\uffff\32\61", "", - "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\1\61\1\u017f\30\61", - "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\2\61\1\u0180\27\61", - "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\23\61\1\u0181\6\61", - "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\4\61\1\u0183\12\61\1\u0182\12\61", - "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\13\61\1\u0184\16\61", - "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\1\u0185\31\61", - "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\15\61\1\u0186\14\61", "", - "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\32\61", - "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\4\61\1\u0188\25\61", + "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\1\61\1\u0180\30\61", + "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\2\61\1\u0181\27\61", + "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\23\61\1\u0182\6\61", + "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\4\61\1\u0184\12\61\1\u0183\12\61", + "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\13\61\1\u0185\16\61", + "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\1\u0186\31\61", + "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\15\61\1\u0187\14\61", "", + "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\32\61", "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\4\61\1\u0189\25\61", "", + "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\4\61\1\u018a\25\61", + "", "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\32\61", - "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\12\61\1\u018b\17\61", - "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\1\u018c\3\uffff\1\61\1\uffff\32\61", - "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\1\u018e\3\uffff\1\61\1\uffff\32\61", + "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\12\61\1\u018c\17\61", + "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\1\u018d\3\uffff\1\61\1\uffff\32\61", + "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\1\u018f\3\uffff\1\61\1\uffff\32\61", "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\32\61", "", "", "", - "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\14\61\1\u0191\15\61", - "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\1\u0192\31\61", - "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\13\61\1\u0193\16\61", - "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\4\61\1\u0194\25\61", + "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\14\61\1\u0192\15\61", + "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\1\u0193\31\61", + "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\13\61\1\u0194\16\61", + "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\4\61\1\u0195\25\61", "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\32\61", "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\32\61", - "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\15\61\1\u0197\14\61", + "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\15\61\1\u0198\14\61", "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\32\61", "", "", @@ -4638,25 +4639,25 @@ public String getDescription() { "", "", "", - "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\4\61\1\u0199\25\61", "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\4\61\1\u019a\25\61", + "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\4\61\1\u019b\25\61", "", - "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\21\61\1\u019b\10\61", "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\21\61\1\u019c\10\61", - "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\1\u019d\31\61", - "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\4\61\1\u019f\12\61\1\u019e\12\61", - "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\13\61\1\u01a0\16\61", - "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\4\61\1\u01a1\25\61", + "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\21\61\1\u019d\10\61", + "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\1\u019e\31\61", + "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\4\61\1\u01a0\12\61\1\u019f\12\61", + "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\13\61\1\u01a1\16\61", "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\4\61\1\u01a2\25\61", + "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\4\61\1\u01a3\25\61", "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\32\61", - "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\4\61\1\u01a4\25\61", - "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\21\61\1\u01a5\10\61", - "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\10\61\1\u01a6\21\61", - "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\2\61\1\u01a7\27\61", + "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\4\61\1\u01a5\25\61", + "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\21\61\1\u01a6\10\61", + "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\10\61\1\u01a7\21\61", "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\2\61\1\u01a8\27\61", + "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\2\61\1\u01a9\27\61", "", "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\32\61", - "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\2\61\1\u01aa\27\61", + "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\2\61\1\u01ab\27\61", "", "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\32\61", "", @@ -4664,115 +4665,115 @@ public String getDescription() { "", "", "", - "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\4\61\1\u01ac\25\61", - "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\14\61\1\u01ad\15\61", - "\1\44\12\61\3\uffff\1\63\3\uffff\3\61\1\u01ae\26\61\4\uffff\1\61\1\uffff\32\61", - "\1\44\12\61\3\uffff\1\63\3\uffff\15\61\1\u01af\14\61\4\uffff\1\61\1\uffff\32\61", + "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\4\61\1\u01ad\25\61", + "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\14\61\1\u01ae\15\61", + "\1\44\12\61\3\uffff\1\63\3\uffff\3\61\1\u01af\26\61\4\uffff\1\61\1\uffff\32\61", + "\1\44\12\61\3\uffff\1\63\3\uffff\15\61\1\u01b0\14\61\4\uffff\1\61\1\uffff\32\61", "", "", "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\32\61", "", - "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\23\61\1\u01b1\6\61", - "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\17\61\1\u01b2\12\61", - "\1\44\12\61\3\uffff\1\63\3\uffff\1\u01b4\21\61\1\u01b5\7\61\4\uffff\1\61\1\uffff\22\61\1\u01b3\7\61", - "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\22\61\1\u01b7\7\61", - "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\14\61\1\u01b9\15\61", - "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\4\61\1\u01ba\25\61", - "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\21\61\1\u01bb\10\61", - "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\10\61\1\u01bc\21\61", - "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\21\61\1\u01bd\10\61", + "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\23\61\1\u01b2\6\61", + "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\17\61\1\u01b3\12\61", + "\1\44\12\61\3\uffff\1\63\3\uffff\1\u01b5\21\61\1\u01b6\7\61\4\uffff\1\61\1\uffff\22\61\1\u01b4\7\61", + "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\22\61\1\u01b8\7\61", + "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\14\61\1\u01ba\15\61", + "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\4\61\1\u01bb\25\61", + "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\21\61\1\u01bc\10\61", + "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\10\61\1\u01bd\21\61", + "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\21\61\1\u01be\10\61", "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\32\61", "", - "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\2\61\1\u01bf\27\61", - "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\25\61\1\u01c0\4\61", - "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\4\61\1\u01c1\25\61", - "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\12\61\1\u01c2\17\61", - "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\10\61\1\u01c3\21\61", + "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\2\61\1\u01c0\27\61", + "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\25\61\1\u01c1\4\61", + "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\4\61\1\u01c2\25\61", + "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\12\61\1\u01c3\17\61", + "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\10\61\1\u01c4\21\61", "", "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\32\61", "", "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\32\61", - "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\4\61\1\u01c6\25\61", "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\4\61\1\u01c7\25\61", - "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\1\u01c8\31\61", + "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\4\61\1\u01c8\25\61", + "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\1\u01c9\31\61", "", "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\32\61", - "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\4\61\1\u01ca\25\61", + "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\4\61\1\u01cb\25\61", "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\32\61", - "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\15\61\1\u01cc\14\61", - "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\23\61\1\u01cd\6\61", + "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\15\61\1\u01cd\14\61", + "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\23\61\1\u01ce\6\61", "", "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\32\61", "", - "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\4\61\1\u01cf\25\61", - "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\2\61\1\u01d0\27\61", - "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\25\61\1\u01d1\4\61", - "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\4\61\1\u01d2\25\61", - "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\22\61\1\u01d3\7\61", + "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\4\61\1\u01d0\25\61", + "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\2\61\1\u01d1\27\61", + "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\25\61\1\u01d2\4\61", + "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\4\61\1\u01d3\25\61", + "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\22\61\1\u01d4\7\61", "", "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\32\61", - "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\4\61\1\u01d6\25\61", - "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\15\61\1\u01d7\14\61", - "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\1\u01d8\31\61", - "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\4\61\1\u01d9\25\61", + "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\4\61\1\u01d7\25\61", + "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\15\61\1\u01d8\14\61", + "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\1\u01d9\31\61", + "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\4\61\1\u01da\25\61", "", "", - "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\22\61\1\u01da\7\61", - "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\17\61\1\u01db\12\61", - "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\14\61\1\u01dc\15\61", + "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\22\61\1\u01db\7\61", + "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\17\61\1\u01dc\12\61", + "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\14\61\1\u01dd\15\61", "", - "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\15\61\1\u01dd\14\61", + "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\15\61\1\u01de\14\61", "", - "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\30\61\1\u01de\1\61", - "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\21\61\1\u01df\10\61", + "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\30\61\1\u01df\1\61", + "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\21\61\1\u01e0\10\61", "", - "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\22\61\1\u01e0\7\61", + "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\22\61\1\u01e1\7\61", "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\32\61", - "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\4\61\1\u01e2\25\61", - "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\15\61\1\u01e3\14\61", + "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\4\61\1\u01e3\25\61", + "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\15\61\1\u01e4\14\61", "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\32\61", "", "", - "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\21\61\1\u01e5\10\61", - "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\23\61\1\u01e6\6\61", - "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\6\61\1\u01e7\23\61", - "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\22\61\1\u01e8\7\61", - "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\17\61\1\u01e9\12\61", - "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\4\61\1\u01ea\25\61", + "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\21\61\1\u01e6\10\61", + "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\23\61\1\u01e7\6\61", + "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\6\61\1\u01e8\23\61", + "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\22\61\1\u01e9\7\61", + "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\17\61\1\u01ea\12\61", "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\4\61\1\u01eb\25\61", - "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\3\61\1\u01ec\26\61", + "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\4\61\1\u01ec\25\61", + "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\3\61\1\u01ed\26\61", "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\32\61", - "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\24\61\1\u01ee\5\61", - "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\17\61\1\u01ef\12\61", + "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\24\61\1\u01ef\5\61", + "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\17\61\1\u01f0\12\61", "", - "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\21\61\1\u01f0\10\61", - "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\23\61\1\u01f1\6\61", + "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\21\61\1\u01f1\10\61", + "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\23\61\1\u01f2\6\61", "", - "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\22\61\1\u01f2\7\61", - "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\22\61\1\u01f4\7\61", - "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\4\61\1\u01f6\25\61", + "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\22\61\1\u01f3\7\61", + "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\22\61\1\u01f5\7\61", + "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\4\61\1\u01f7\25\61", "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\32\61", - "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\1\u01f8\31\61", - "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\15\61\1\u01f9\14\61", - "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\22\61\1\u01fa\7\61", - "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\4\61\1\u01fb\25\61", + "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\1\u01f9\31\61", + "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\15\61\1\u01fa\14\61", + "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\22\61\1\u01fb\7\61", + "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\4\61\1\u01fc\25\61", "", - "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\2\61\1\u01fc\27\61", - "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\1\u01fd\31\61", - "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\22\61\1\u01fe\7\61", - "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\22\61\1\u0200\7\61", + "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\2\61\1\u01fd\27\61", + "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\1\u01fe\31\61", + "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\22\61\1\u01ff\7\61", + "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\22\61\1\u0201\7\61", "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\32\61", "", "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\32\61", "", "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\32\61", "", - "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\2\61\1\u0205\27\61", - "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\3\61\1\u0206\26\61", - "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\17\61\1\u0207\12\61", - "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\15\61\1\u0208\14\61", - "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\23\61\1\u0209\6\61", - "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\2\61\1\u020a\27\61", + "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\2\61\1\u0206\27\61", + "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\3\61\1\u0207\26\61", + "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\17\61\1\u0208\12\61", + "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\15\61\1\u0209\14\61", + "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\23\61\1\u020a\6\61", + "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\2\61\1\u020b\27\61", "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\32\61", "", "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\32\61", @@ -4780,35 +4781,35 @@ public String getDescription() { "", "", "", - "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\4\61\1\u020d\25\61", "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\4\61\1\u020e\25\61", - "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\1\u020f\31\61", - "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\2\61\1\u0210\27\61", - "\1\44\12\61\3\uffff\1\63\3\uffff\14\61\1\u0211\15\61\4\uffff\1\61\1\uffff\32\61", - "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\4\61\1\u0212\25\61", + "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\4\61\1\u020f\25\61", + "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\1\u0210\31\61", + "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\2\61\1\u0211\27\61", + "\1\44\12\61\3\uffff\1\63\3\uffff\14\61\1\u0212\15\61\4\uffff\1\61\1\uffff\32\61", + "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\4\61\1\u0213\25\61", "", "", "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\32\61", - "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\15\61\1\u0214\14\61", - "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\2\61\1\u0215\27\61", - "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\30\61\1\u0216\1\61", - "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\4\61\1\u0217\25\61", + "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\15\61\1\u0215\14\61", + "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\2\61\1\u0216\27\61", + "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\30\61\1\u0217\1\61", + "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\4\61\1\u0218\25\61", "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\32\61", "", - "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\2\61\1\u0219\27\61", - "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\4\61\1\u021a\25\61", + "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\2\61\1\u021a\27\61", + "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\4\61\1\u021b\25\61", "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\32\61", - "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\14\61\1\u021c\15\61", + "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\14\61\1\u021d\15\61", "", - "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\30\61\1\u021d\1\61", + "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\30\61\1\u021e\1\61", "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\32\61", "", - "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\1\61\1\u021f\30\61", + "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\1\61\1\u0220\30\61", "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\32\61", "", - "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\4\61\1\u0221\25\61", + "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\4\61\1\u0222\25\61", "", - "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\21\61\1\u0222\10\61", + "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\21\61\1\u0223\10\61", "\1\44\12\61\3\uffff\1\63\3\uffff\32\61\4\uffff\1\61\1\uffff\32\61", "" }; @@ -4874,6 +4875,36 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc if ( s>=0 ) return s; break; case 2 : + int LA30_102 = input.LA(1); + + s = -1; + if ( ((LA30_102>='\u0000' && LA30_102<='\uFFFF')) ) {s = 164;} + + if ( s>=0 ) return s; + break; + case 3 : + int LA30_105 = input.LA(1); + + s = -1; + if ( ((LA30_105>='\u0000' && LA30_105<='\uFFFF')) ) {s = 166;} + + if ( s>=0 ) return s; + break; + case 4 : + int LA30_37 = input.LA(1); + + s = -1; + if ( (LA30_37=='\\') ) {s = 102;} + + else if ( ((LA30_37>='\u0000' && LA30_37<='!')||(LA30_37>='#' && LA30_37<='[')||(LA30_37>=']' && LA30_37<='\uFFFF')) ) {s = 103;} + + else if ( (LA30_37=='\"') ) {s = 104;} + + else s = 45; + + if ( s>=0 ) return s; + break; + case 5 : int LA30_0 = input.LA(1); s = -1; @@ -4967,36 +4998,6 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc else s = 36; - if ( s>=0 ) return s; - break; - case 3 : - int LA30_102 = input.LA(1); - - s = -1; - if ( ((LA30_102>='\u0000' && LA30_102<='\uFFFF')) ) {s = 164;} - - if ( s>=0 ) return s; - break; - case 4 : - int LA30_105 = input.LA(1); - - s = -1; - if ( ((LA30_105>='\u0000' && LA30_105<='\uFFFF')) ) {s = 166;} - - if ( s>=0 ) return s; - break; - case 5 : - int LA30_37 = input.LA(1); - - s = -1; - if ( (LA30_37=='\\') ) {s = 102;} - - else if ( ((LA30_37>='\u0000' && LA30_37<='!')||(LA30_37>='#' && LA30_37<='[')||(LA30_37>=']' && LA30_37<='\uFFFF')) ) {s = 103;} - - else if ( (LA30_37=='\"') ) {s = 104;} - - else s = 45; - if ( s>=0 ) return s; break; case 6 : @@ -5046,4 +5047,4 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc } -} +} \ No newline at end of file diff --git a/plugins/de.fraunhofer.ipa.ros.xtext/src-gen/de/fraunhofer/ipa/ros/parser/antlr/internal/InternalRosParser.java b/plugins/de.fraunhofer.ipa.ros.xtext/src-gen/de/fraunhofer/ipa/ros/parser/antlr/internal/InternalRosParser.java index 85c884e02..f7833cc2d 100644 --- a/plugins/de.fraunhofer.ipa.ros.xtext/src-gen/de/fraunhofer/ipa/ros/parser/antlr/internal/InternalRosParser.java +++ b/plugins/de.fraunhofer.ipa.ros.xtext/src-gen/de/fraunhofer/ipa/ros/parser/antlr/internal/InternalRosParser.java @@ -21,7 +21,7 @@ @SuppressWarnings("all") public class InternalRosParser extends AbstractInternalAntlrParser { public static final String[] tokenNames = new String[] { - "", "", "", "", "RULE_STRING", "RULE_ID", "RULE_ROS_CONVENTION_A", "RULE_BINARY", "RULE_BOOLEAN", "RULE_DOUBLE", "RULE_DECINT", "RULE_DATE_TIME", "RULE_MESSAGE_ASIGMENT", "RULE_ROS_CONVENTION_PARAM", "RULE_DIGIT", "RULE_DAY", "RULE_MONTH", "RULE_YEAR", "RULE_HOUR", "RULE_MIN_SEC", "RULE_INT", "RULE_ML_COMMENT", "RULE_SL_COMMENT", "RULE_WS", "RULE_ANY_OTHER", "'PackageSet'", "'{'", "','", "'}'", "'Package'", "'Specs'", "'node'", "'Artifact'", "'CatkinPackage'", "'Dependencies'", "'ServiceSpec'", "'request'", "'response'", "'TopicSpec'", "'Header'", "'String'", "'message'", "'ActionSpec'", "'goal'", "'result'", "'feedback'", "'Node'", "'name'", "'ServiceServers'", "'Publishers'", "'Subscribers'", "'ServiceClients'", "'ActionServers'", "'ActionClients'", "'Parameters'", "'ServiceServer'", "'service'", "'namespace'", "'Publisher'", "'Subscriber'", "'ServiceClient'", "'ActionServer'", "'action'", "'ActionClient'", "'GraphName'", "'PackageDependency'", "'ExternalDependency'", "'GlobalNamespace'", "'parts'", "'RelativeNamespace'", "'PrivateNamespace'", "'Parameter'", "'type'", "'List'", "'Struc'", "'Integer'", "'default'", "'Double'", "'Boolean'", "'Base64'", "'Array'", "'ParameterAny'", "'value'", "'ParameterStructMember'", "'bool'", "'int8'", "'uint8'", "'int16'", "'uint16'", "'int32'", "'uint32'", "'int64'", "'uint64'", "'float32'", "'float64'", "'string'", "'byte'", "'time'", "'duration'", "'bool[]'", "'int8[]'", "'uint8[]'", "'int16[]'", "'uint16[]'", "'int32[]'", "'uint32[]'", "'int64[]'", "'uint64[]'", "'float32[]'", "'float64[]'", "'string[]'", "'byte[]'", "'[]'" + "", "", "", "", "RULE_STRING", "RULE_ID", "RULE_ROS_CONVENTION_A", "RULE_BINARY", "RULE_BOOLEAN", "RULE_DOUBLE", "RULE_DECINT", "RULE_DATE_TIME", "RULE_MESSAGE_ASIGMENT", "RULE_ROS_CONVENTION_PARAM", "RULE_DIGIT", "RULE_DAY", "RULE_MONTH", "RULE_YEAR", "RULE_HOUR", "RULE_MIN_SEC", "RULE_INT", "RULE_ML_COMMENT", "RULE_SL_COMMENT", "RULE_WS", "RULE_ANY_OTHER", "'PackageSet'", "'{'", "','", "'}'", "'Package'", "'Specs'", "'node'", "'Artifact'", "'CatkinPackage'", "'Dependencies'", "'ServiceSpec'", "'request'", "'response'", "'TopicSpec'", "'Header'", "'String'", "'message'", "'ActionSpec'", "'goal'", "'result'", "'feedback'", "'Node'", "'name'", "'ServiceServers'", "'Publishers'", "'Subscribers'", "'ServiceClients'", "'ActionServers'", "'ActionClients'", "'Parameters'", "'ServiceServer'", "'service'", "'namespace'", "'Publisher'", "'Subscriber'", "'ServiceClient'", "'ActionServer'", "'action'", "'ActionClient'", "'GraphName'", "'PackageDependency'", "'ExternalDependency'", "'GlobalNamespace'", "'parts'", "'RelativeNamespace'", "'PrivateNamespace'", "'Parameter'", "'type'", "'List'", "'Struct'", "'Integer'", "'default'", "'Double'", "'Boolean'", "'Base64'", "'Array'", "'ParameterAny'", "'value'", "'ParameterStructMember'", "'bool'", "'int8'", "'uint8'", "'int16'", "'uint16'", "'int32'", "'uint32'", "'int64'", "'uint64'", "'float32'", "'float64'", "'string'", "'byte'", "'time'", "'duration'", "'bool[]'", "'int8[]'", "'uint8[]'", "'int16[]'", "'uint16[]'", "'int32[]'", "'uint32[]'", "'int64[]'", "'uint64[]'", "'float32[]'", "'float64[]'", "'string[]'", "'byte[]'", "'[]'" }; public static final int T__50=50; public static final int RULE_DATE_TIME=11; @@ -7549,7 +7549,7 @@ public final EObject entryRuleParameterStructType() throws RecognitionException // $ANTLR start "ruleParameterStructType" - // InternalRos.g:3073:1: ruleParameterStructType returns [EObject current=null] : ( () otherlv_1= 'Struc' otherlv_2= '{' ( (lv_parameterstructypetmember_3_0= ruleParameterStructTypeMember ) ) (otherlv_4= ',' ( (lv_parameterstructypetmember_5_0= ruleParameterStructTypeMember ) ) )* otherlv_6= '}' ) ; + // InternalRos.g:3073:1: ruleParameterStructType returns [EObject current=null] : ( () otherlv_1= 'Struct' otherlv_2= '{' ( (lv_parameterstructypetmember_3_0= ruleParameterStructTypeMember ) ) (otherlv_4= ',' ( (lv_parameterstructypetmember_5_0= ruleParameterStructTypeMember ) ) )* otherlv_6= '}' ) ; public final EObject ruleParameterStructType() throws RecognitionException { EObject current = null; @@ -7566,11 +7566,11 @@ public final EObject ruleParameterStructType() throws RecognitionException { enterRule(); try { - // InternalRos.g:3079:2: ( ( () otherlv_1= 'Struc' otherlv_2= '{' ( (lv_parameterstructypetmember_3_0= ruleParameterStructTypeMember ) ) (otherlv_4= ',' ( (lv_parameterstructypetmember_5_0= ruleParameterStructTypeMember ) ) )* otherlv_6= '}' ) ) - // InternalRos.g:3080:2: ( () otherlv_1= 'Struc' otherlv_2= '{' ( (lv_parameterstructypetmember_3_0= ruleParameterStructTypeMember ) ) (otherlv_4= ',' ( (lv_parameterstructypetmember_5_0= ruleParameterStructTypeMember ) ) )* otherlv_6= '}' ) + // InternalRos.g:3079:2: ( ( () otherlv_1= 'Struct' otherlv_2= '{' ( (lv_parameterstructypetmember_3_0= ruleParameterStructTypeMember ) ) (otherlv_4= ',' ( (lv_parameterstructypetmember_5_0= ruleParameterStructTypeMember ) ) )* otherlv_6= '}' ) ) + // InternalRos.g:3080:2: ( () otherlv_1= 'Struct' otherlv_2= '{' ( (lv_parameterstructypetmember_3_0= ruleParameterStructTypeMember ) ) (otherlv_4= ',' ( (lv_parameterstructypetmember_5_0= ruleParameterStructTypeMember ) ) )* otherlv_6= '}' ) { - // InternalRos.g:3080:2: ( () otherlv_1= 'Struc' otherlv_2= '{' ( (lv_parameterstructypetmember_3_0= ruleParameterStructTypeMember ) ) (otherlv_4= ',' ( (lv_parameterstructypetmember_5_0= ruleParameterStructTypeMember ) ) )* otherlv_6= '}' ) - // InternalRos.g:3081:3: () otherlv_1= 'Struc' otherlv_2= '{' ( (lv_parameterstructypetmember_3_0= ruleParameterStructTypeMember ) ) (otherlv_4= ',' ( (lv_parameterstructypetmember_5_0= ruleParameterStructTypeMember ) ) )* otherlv_6= '}' + // InternalRos.g:3080:2: ( () otherlv_1= 'Struct' otherlv_2= '{' ( (lv_parameterstructypetmember_3_0= ruleParameterStructTypeMember ) ) (otherlv_4= ',' ( (lv_parameterstructypetmember_5_0= ruleParameterStructTypeMember ) ) )* otherlv_6= '}' ) + // InternalRos.g:3081:3: () otherlv_1= 'Struct' otherlv_2= '{' ( (lv_parameterstructypetmember_3_0= ruleParameterStructTypeMember ) ) (otherlv_4= ',' ( (lv_parameterstructypetmember_5_0= ruleParameterStructTypeMember ) ) )* otherlv_6= '}' { // InternalRos.g:3081:3: () // InternalRos.g:3082:4: @@ -7585,7 +7585,7 @@ public final EObject ruleParameterStructType() throws RecognitionException { otherlv_1=(Token)match(input,74,FOLLOW_3); - newLeafNode(otherlv_1, grammarAccess.getParameterStructTypeAccess().getStrucKeyword_1()); + newLeafNode(otherlv_1, grammarAccess.getParameterStructTypeAccess().getStructKeyword_1()); otherlv_2=(Token)match(input,26,FOLLOW_7); @@ -14650,4 +14650,4 @@ public String getDescription() { public static final BitSet FOLLOW_63 = new BitSet(new long[]{0x4100BA0000001030L,0x0000000600040100L}); public static final BitSet FOLLOW_64 = new BitSet(new long[]{0x0000000000000000L,0x0001000000000000L}); -} +} \ No newline at end of file diff --git a/plugins/de.fraunhofer.ipa.ros.xtext/src-gen/de/fraunhofer/ipa/ros/serializer/RosSemanticSequencer.java b/plugins/de.fraunhofer.ipa.ros.xtext/src-gen/de/fraunhofer/ipa/ros/serializer/RosSemanticSequencer.java index b4082e76a..4001258a7 100644 --- a/plugins/de.fraunhofer.ipa.ros.xtext/src-gen/de/fraunhofer/ipa/ros/serializer/RosSemanticSequencer.java +++ b/plugins/de.fraunhofer.ipa.ros.xtext/src-gen/de/fraunhofer/ipa/ros/serializer/RosSemanticSequencer.java @@ -394,7 +394,7 @@ protected void sequence_ArrayTopicSpecRef(ISerializationContext context, ArrayTo * Artifact returns Artifact * * Constraint: - * (name=RosNames (node=Node | node=Node)?) + * (name=RosNames node=Node?) */ protected void sequence_Artifact(ISerializationContext context, Artifact semanticObject) { genericSequencer.createSequence(context, semanticObject); @@ -407,12 +407,7 @@ protected void sequence_Artifact(ISerializationContext context, Artifact semanti * CatkinPackage returns CatkinPackage * * Constraint: - * ( - * name=RosNames - * ((spec+=SpecBase spec+=SpecBase*) | (spec+=SpecBase spec+=SpecBase*))? - * ((artifact+=Artifact artifact+=Artifact*) | (artifact+=Artifact artifact+=Artifact*))? - * ((dependency+=Dependency dependency+=Dependency*) | (dependency+=Dependency dependency+=Dependency*))? - * ) + * (name=RosNames (spec+=SpecBase spec+=SpecBase*)? (artifact+=Artifact artifact+=Artifact*)? (dependency+=Dependency dependency+=Dependency*)?) */ protected void sequence_CatkinPackage(ISerializationContext context, CatkinPackage semanticObject) { genericSequencer.createSequence(context, semanticObject); @@ -495,13 +490,13 @@ protected void sequence_MessagePart(ISerializationContext context, MessagePart s * Constraint: * ( * name=RosNames - * ((serviceserver+=ServiceServer serviceserver+=ServiceServer*) | (serviceserver+=ServiceServer serviceserver+=ServiceServer*))? - * ((publisher+=Publisher publisher+=Publisher*) | (publisher+=Publisher publisher+=Publisher*))? - * ((subscriber+=Subscriber subscriber+=Subscriber*) | (subscriber+=Subscriber subscriber+=Subscriber*))? - * ((serviceclient+=ServiceClient serviceclient+=ServiceClient*) | (serviceclient+=ServiceClient serviceclient+=ServiceClient*))? - * ((actionserver+=ActionServer actionserver+=ActionServer*) | (actionserver+=ActionServer actionserver+=ActionServer*))? - * ((actionclient+=ActionClient actionclient+=ActionClient*) | (actionclient+=ActionClient actionclient+=ActionClient*))? - * ((parameter+=Parameter parameter+=Parameter*) | (parameter+=Parameter parameter+=Parameter*))? + * (serviceserver+=ServiceServer serviceserver+=ServiceServer*)? + * (publisher+=Publisher publisher+=Publisher*)? + * (subscriber+=Subscriber subscriber+=Subscriber*)? + * (serviceclient+=ServiceClient serviceclient+=ServiceClient*)? + * (actionserver+=ActionServer actionserver+=ActionServer*)? + * (actionclient+=ActionClient actionclient+=ActionClient*)? + * (parameter+=Parameter parameter+=Parameter*)? * ) */ protected void sequence_Node(ISerializationContext context, Node semanticObject) { @@ -533,7 +528,7 @@ protected void sequence_PackageDependency(ISerializationContext context, Package * PackageSet returns PackageSet * * Constraint: - * ((package+=Package package+=Package*) | (package+=Package package+=Package*))? + * (package+=Package package+=Package*)? */ protected void sequence_PackageSet(ISerializationContext context, PackageSet semanticObject) { genericSequencer.createSequence(context, semanticObject); @@ -546,11 +541,7 @@ protected void sequence_PackageSet(ISerializationContext context, PackageSet sem * Package_Impl returns Package * * Constraint: - * ( - * name=EString - * ((spec+=SpecBase spec+=SpecBase*) | (spec+=SpecBase spec+=SpecBase*))? - * ((artifact+=Artifact artifact+=Artifact*) | (artifact+=Artifact artifact+=Artifact*))? - * ) + * (name=EString (spec+=SpecBase spec+=SpecBase*)? (artifact+=Artifact artifact+=Artifact*)?) */ protected void sequence_Package_Impl(ISerializationContext context, ros.Package semanticObject) { genericSequencer.createSequence(context, semanticObject); diff --git a/plugins/de.fraunhofer.ipa.ros.xtext/src-gen/de/fraunhofer/ipa/ros/services/RosGrammarAccess.java b/plugins/de.fraunhofer.ipa.ros.xtext/src-gen/de/fraunhofer/ipa/ros/services/RosGrammarAccess.java index d23646d30..b8d7e0c82 100644 --- a/plugins/de.fraunhofer.ipa.ros.xtext/src-gen/de/fraunhofer/ipa/ros/services/RosGrammarAccess.java +++ b/plugins/de.fraunhofer.ipa.ros.xtext/src-gen/de/fraunhofer/ipa/ros/services/RosGrammarAccess.java @@ -1,5 +1,5 @@ /* - * generated by Xtext 2.16.0 + * generated by Xtext 2.24.0 */ package de.fraunhofer.ipa.ros.services; @@ -18,11 +18,11 @@ import org.eclipse.xtext.RuleCall; import org.eclipse.xtext.TerminalRule; import org.eclipse.xtext.common.services.TerminalsGrammarAccess; -import org.eclipse.xtext.service.AbstractElementFinder.AbstractGrammarElementFinder; +import org.eclipse.xtext.service.AbstractElementFinder; import org.eclipse.xtext.service.GrammarProvider; @Singleton -public class RosGrammarAccess extends AbstractGrammarElementFinder { +public class RosGrammarAccess extends AbstractElementFinder.AbstractGrammarElementFinder { public class PackageSetElements extends AbstractParserRuleElementFinder { private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "de.fraunhofer.ipa.ros.Ros.PackageSet"); @@ -46,7 +46,10 @@ public class PackageSetElements extends AbstractParserRuleElementFinder { // '}'; @Override public ParserRule getRule() { return rule; } - //{PackageSet} 'PackageSet' '{' (package+=Package ("," package+=Package)*)? '}' + //{PackageSet} + //'PackageSet' + //'{' (package+=Package ("," package+=Package)*)? + //'}' public Group getGroup() { return cGroup; } //{PackageSet} @@ -201,8 +204,11 @@ public class Package_ImplElements extends AbstractParserRuleElementFinder { // '}'; @Override public ParserRule getRule() { return rule; } - //{Package} 'Package' name=EString '{' ('Specs' '{' spec+=SpecBase ("," spec+=SpecBase)* '}')? (artifact+=Artifact ("," - //artifact+=Artifact)*)? '}' + //{Package} + //'Package' + //name=EString + //'{' ('Specs' '{' spec+=SpecBase ("," spec+=SpecBase)* '}')? (artifact+=Artifact ("," artifact+=Artifact)*)? + //'}' public Group getGroup() { return cGroup; } //{Package} @@ -356,7 +362,12 @@ public class ArtifactElements extends AbstractParserRuleElementFinder { // '}'; @Override public ParserRule getRule() { return rule; } - //{Artifact} 'Artifact' name=RosNames '{' node=Node? '}' + //{Artifact} + //'Artifact' + //name=RosNames + //'{' + //node=Node? + //'}' public Group getGroup() { return cGroup; } //{Artifact} @@ -424,14 +435,17 @@ public class CatkinPackageElements extends AbstractParserRuleElementFinder { // {CatkinPackage} // 'CatkinPackage' // name=RosNames - // '{' ('Specs' '{' spec+=SpecBase ("," spec+=SpecBase)* '}')? (artifact+=Artifact ("," artifact+=Artifact)*)? - // ('Dependencies' '{' dependency+=Dependency ("," dependency+=Dependency)* '}')? + // '{' ('Specs' '{' spec+=SpecBase ("," spec+=SpecBase)* '}')? (artifact+=Artifact ("," artifact+=Artifact)*)? ( + // 'Dependencies' '{' dependency+=Dependency ("," dependency+=Dependency)* '}')? // '}'; @Override public ParserRule getRule() { return rule; } - //{CatkinPackage} 'CatkinPackage' name=RosNames '{' ('Specs' '{' spec+=SpecBase ("," spec+=SpecBase)* '}')? - //(artifact+=Artifact ("," artifact+=Artifact)*)? ('Dependencies' '{' dependency+=Dependency ("," - //dependency+=Dependency)* '}')? '}' + //{CatkinPackage} + //'CatkinPackage' + //name=RosNames + //'{' ('Specs' '{' spec+=SpecBase ("," spec+=SpecBase)* '}')? (artifact+=Artifact ("," artifact+=Artifact)*)? ('Dependencies' + //'{' dependency+=Dependency ("," dependency+=Dependency)* '}')? + //'}' public Group getGroup() { return cGroup; } //{CatkinPackage} @@ -559,8 +573,11 @@ public class ServiceSpecElements extends AbstractParserRuleElementFinder { // '}'; @Override public ParserRule getRule() { return rule; } - //{ServiceSpec} 'ServiceSpec' name=EString '{' ('request' request=MessageDefinition)? ('response' - //response=MessageDefinition)? '}' + //{ServiceSpec} + //'ServiceSpec' + //name=EString + //'{' ('request' request=MessageDefinition)? ('response' response=MessageDefinition)? + //'}' public Group getGroup() { return cGroup; } //{ServiceSpec} @@ -630,7 +647,11 @@ public class TopicSpecElements extends AbstractParserRuleElementFinder { // '}'; @Override public ParserRule getRule() { return rule; } - //{TopicSpec} 'TopicSpec' name=(EString | 'Header' | 'String') '{' ('message' message=MessageDefinition)? '}' + //{TopicSpec} + //'TopicSpec' + //name=(EString | 'Header' | 'String') + //'{' ('message' message=MessageDefinition)? + //'}' public Group getGroup() { return cGroup; } //{TopicSpec} @@ -702,8 +723,11 @@ public class ActionSpecElements extends AbstractParserRuleElementFinder { // '}'; @Override public ParserRule getRule() { return rule; } - //{ActionSpec} 'ActionSpec' name=EString '{' ('goal' goal=MessageDefinition)? ('result' result=MessageDefinition)? - //('feedback' feedback=MessageDefinition)? '}' + //{ActionSpec} + //'ActionSpec' + //name=EString + //'{' ('goal' goal=MessageDefinition)? ('result' result=MessageDefinition)? ('feedback' feedback=MessageDefinition)? + //'}' public Group getGroup() { return cGroup; } //{ActionSpec} @@ -778,7 +802,9 @@ public class MessageDefinitionElements extends AbstractParserRuleElementFinder { // '}'; @Override public ParserRule getRule() { return rule; } - //{MessageDefinition} '{' (MessagePart+=MessagePart MessagePart+=MessagePart*)? '}' + //{MessageDefinition} + //'{' (MessagePart+=MessagePart MessagePart+=MessagePart*)? + //'}' public Group getGroup() { return cGroup; } //{MessageDefinition} @@ -888,21 +914,24 @@ public class NodeElements extends AbstractParserRuleElementFinder { //Node: // 'Node' // '{' - // 'name' name=RosNames ('ServiceServers' '{' serviceserver+=ServiceServer ("," serviceserver+=ServiceServer)* '}')? - // ('Publishers' '{' publisher+=Publisher ("," publisher+=Publisher)* '}')? ('Subscribers' '{' subscriber+=Subscriber - // ("," subscriber+=Subscriber)* '}')? ('ServiceClients' '{' serviceclient+=ServiceClient ("," - // serviceclient+=ServiceClient)* '}')? ('ActionServers' '{' actionserver+=ActionServer ("," actionserver+=ActionServer)* - // '}')? ('ActionClients' '{' actionclient+=ActionClient ("," actionclient+=ActionClient)* '}')? ('Parameters' '{' + // 'name' name=RosNames ('ServiceServers' '{' serviceserver+=ServiceServer ("," serviceserver+=ServiceServer)* '}')? ( + // 'Publishers' '{' publisher+=Publisher ("," publisher+=Publisher)* '}')? ('Subscribers' '{' subscriber+=Subscriber ( + // "," subscriber+=Subscriber)* '}')? ('ServiceClients' '{' serviceclient+=ServiceClient ("," + // serviceclient+=ServiceClient)* '}')? ('ActionServers' '{' actionserver+=ActionServer ("," actionserver+=ActionServer) + // * '}')? ('ActionClients' '{' actionclient+=ActionClient ("," actionclient+=ActionClient)* '}')? ('Parameters' '{' // parameter+=Parameter ("," parameter+=Parameter)* '}')? // '}'; @Override public ParserRule getRule() { return rule; } - //'Node' '{' 'name' name=RosNames ('ServiceServers' '{' serviceserver+=ServiceServer ("," serviceserver+=ServiceServer)* - //'}')? ('Publishers' '{' publisher+=Publisher ("," publisher+=Publisher)* '}')? ('Subscribers' '{' - //subscriber+=Subscriber ("," subscriber+=Subscriber)* '}')? ('ServiceClients' '{' serviceclient+=ServiceClient ("," - //serviceclient+=ServiceClient)* '}')? ('ActionServers' '{' actionserver+=ActionServer ("," actionserver+=ActionServer)* - //'}')? ('ActionClients' '{' actionclient+=ActionClient ("," actionclient+=ActionClient)* '}')? ('Parameters' '{' - //parameter+=Parameter ("," parameter+=Parameter)* '}')? '}' + //'Node' + //'{' + //'name' name=RosNames ('ServiceServers' '{' serviceserver+=ServiceServer ("," serviceserver+=ServiceServer)* '}')? ( + //'Publishers' '{' publisher+=Publisher ("," publisher+=Publisher)* '}')? ('Subscribers' '{' subscriber+=Subscriber ("," + //subscriber+=Subscriber)* '}')? ('ServiceClients' '{' serviceclient+=ServiceClient ("," serviceclient+=ServiceClient)* '}' + //)? ('ActionServers' '{' actionserver+=ActionServer ("," actionserver+=ActionServer)* '}')? ('ActionClients' '{' + //actionclient+=ActionClient ("," actionclient+=ActionClient)* '}')? ('Parameters' '{' parameter+=Parameter ("," + //parameter+=Parameter)* '}')? + //'}' public Group getGroup() { return cGroup; } //'Node' @@ -1159,7 +1188,11 @@ public class ServiceServerElements extends AbstractParserRuleElementFinder { // '}'; @Override public ParserRule getRule() { return rule; } - //'ServiceServer' '{' 'name' name=EString 'service' service=[ServiceSpec|EString] ('namespace' namespace=Namespace)? '}' + //'ServiceServer' + //'{' + //'name' name=EString + //'service' service=[ServiceSpec|EString] ('namespace' namespace=Namespace)? + //'}' public Group getGroup() { return cGroup; } //'ServiceServer' @@ -1230,7 +1263,11 @@ public class PublisherElements extends AbstractParserRuleElementFinder { // '}'; @Override public ParserRule getRule() { return rule; } - //'Publisher' '{' 'name' name=EString 'message' message=[TopicSpec|EString] ('namespace' namespace=Namespace)? '}' + //'Publisher' + //'{' + //'name' name=EString + //'message' message=[TopicSpec|EString] ('namespace' namespace=Namespace)? + //'}' public Group getGroup() { return cGroup; } //'Publisher' @@ -1301,7 +1338,11 @@ public class SubscriberElements extends AbstractParserRuleElementFinder { // '}'; @Override public ParserRule getRule() { return rule; } - //'Subscriber' '{' 'name' name=EString 'message' message=[TopicSpec|EString] ('namespace' namespace=Namespace)? '}' + //'Subscriber' + //'{' + //'name' name=EString + //'message' message=[TopicSpec|EString] ('namespace' namespace=Namespace)? + //'}' public Group getGroup() { return cGroup; } //'Subscriber' @@ -1372,7 +1413,11 @@ public class ServiceClientElements extends AbstractParserRuleElementFinder { // '}'; @Override public ParserRule getRule() { return rule; } - //'ServiceClient' '{' 'name' name=EString 'service' service=[ServiceSpec|EString] ('namespace' namespace=Namespace)? '}' + //'ServiceClient' + //'{' + //'name' name=EString + //'service' service=[ServiceSpec|EString] ('namespace' namespace=Namespace)? + //'}' public Group getGroup() { return cGroup; } //'ServiceClient' @@ -1443,7 +1488,11 @@ public class ActionServerElements extends AbstractParserRuleElementFinder { // '}'; @Override public ParserRule getRule() { return rule; } - //'ActionServer' '{' 'name' name=EString 'action' action=[ActionSpec|EString] ('namespace' namespace=Namespace)? '}' + //'ActionServer' + //'{' + //'name' name=EString + //'action' action=[ActionSpec|EString] ('namespace' namespace=Namespace)? + //'}' public Group getGroup() { return cGroup; } //'ActionServer' @@ -1514,7 +1563,11 @@ public class ActionClientElements extends AbstractParserRuleElementFinder { // '}'; @Override public ParserRule getRule() { return rule; } - //'ActionClient' '{' 'name' name=EString 'action' action=[ActionSpec|EString] ('namespace' namespace=Namespace)? '}' + //'ActionClient' + //'{' + //'name' name=EString + //'action' action=[ActionSpec|EString] ('namespace' namespace=Namespace)? + //'}' public Group getGroup() { return cGroup; } //'ActionClient' @@ -1583,7 +1636,8 @@ public class PackageDependencyElements extends AbstractParserRuleElementFinder { // package=[Package|EString]; @Override public ParserRule getRule() { return rule; } - //'PackageDependency' package=[Package|EString] + //'PackageDependency' + //package=[Package|EString] public Group getGroup() { return cGroup; } //'PackageDependency' @@ -1612,7 +1666,9 @@ public class ExternalDependencyElements extends AbstractParserRuleElementFinder // name=EString; @Override public ParserRule getRule() { return rule; } - //{ExternalDependency} 'ExternalDependency' name=EString + //{ExternalDependency} + //'ExternalDependency' + //name=EString public Group getGroup() { return cGroup; } //{ExternalDependency} @@ -1652,7 +1708,10 @@ public class GlobalNamespaceElements extends AbstractParserRuleElementFinder { // '}'; @Override public ParserRule getRule() { return rule; } - //{GlobalNamespace} 'GlobalNamespace' '{' ('parts' '{' parts+=GraphName ("," parts+=GraphName)* '}')? '}' + //{GlobalNamespace} + //'GlobalNamespace' + //'{' ('parts' '{' parts+=GraphName ("," parts+=GraphName)* '}')? + //'}' public Group getGroup() { return cGroup; } //{GlobalNamespace} @@ -1722,7 +1781,10 @@ public class RelativeNamespace_ImplElements extends AbstractParserRuleElementFin // '}'; @Override public ParserRule getRule() { return rule; } - //{RelativeNamespace} 'RelativeNamespace' '{' ('parts' '{' parts+=GraphName ("," parts+=GraphName)* '}')? '}' + //{RelativeNamespace} + //'RelativeNamespace' + //'{' ('parts' '{' parts+=GraphName ("," parts+=GraphName)* '}')? + //'}' public Group getGroup() { return cGroup; } //{RelativeNamespace} @@ -1792,7 +1854,10 @@ public class PrivateNamespaceElements extends AbstractParserRuleElementFinder { // '}'; @Override public ParserRule getRule() { return rule; } - //{PrivateNamespace} 'PrivateNamespace' '{' ('parts' '{' parts+=GraphName ("," parts+=GraphName)* '}')? '}' + //{PrivateNamespace} + //'PrivateNamespace' + //'{' ('parts' '{' parts+=GraphName ("," parts+=GraphName)* '}')? + //'}' public Group getGroup() { return cGroup; } //{PrivateNamespace} @@ -1863,7 +1928,11 @@ public class ParameterElements extends AbstractParserRuleElementFinder { // '}'; @Override public ParserRule getRule() { return rule; } - //'Parameter' '{' 'name' name=EString ('namespace' namespace=Namespace)? 'type' type=ParameterType '}' + //'Parameter' + //'{' + //'name' name=EString ('namespace' namespace=Namespace)? + //'type' type=ParameterType + //'}' public Group getGroup() { return cGroup; } //'Parameter' @@ -1962,6 +2031,7 @@ public class ParameterValueElements extends AbstractParserRuleElementFinder { private final RuleCall cParameterStructParserRuleCall_6 = (RuleCall)cAlternatives.eContents().get(6); //// | ParameterDateType; + // //ParameterValue: // ParameterString | ParameterBase64 | ParameterInteger | ParameterDouble | ParameterBoolean | ParameterList | // ParameterStruct; @@ -2007,6 +2077,7 @@ public class ParameterListTypeElements extends AbstractParserRuleElementFinder { private final Keyword cRightCurlyBracketKeyword_5 = (Keyword)cGroup.eContents().get(5); //// | ParameterDate; + // //ParameterListType: // {ParameterListType} // 'List' @@ -2015,7 +2086,11 @@ public class ParameterListTypeElements extends AbstractParserRuleElementFinder { // '}'; @Override public ParserRule getRule() { return rule; } - //{ParameterListType} 'List' '{' sequence+=ParameterType (',' sequence+=ParameterType)* '}' + //{ParameterListType} + //'List' + //'{' + //sequence+=ParameterType (',' sequence+=ParameterType)* + //'}' public Group getGroup() { return cGroup; } //{ParameterListType} @@ -2070,8 +2145,11 @@ public class ParameterStructTypeElements extends AbstractParserRuleElementFinder // '}'; @Override public ParserRule getRule() { return rule; } - //{ParameterStructType} 'Struct' '{' parameterstructypetmember+=ParameterStructTypeMember ("," - //parameterstructypetmember+=ParameterStructTypeMember)* '}' + //{ParameterStructType} + //'Struct' + //'{' + //parameterstructypetmember+=ParameterStructTypeMember ("," parameterstructypetmember+=ParameterStructTypeMember)* + //'}' public Group getGroup() { return cGroup; } //{ParameterStructType} @@ -2121,7 +2199,8 @@ public class ParameterIntegerTypeElements extends AbstractParserRuleElementFinde // 'Integer' ('{' 'default' default=ParameterInteger '}')?; @Override public ParserRule getRule() { return rule; } - //{ParameterIntegerType} 'Integer' ('{' 'default' default=ParameterInteger '}')? + //{ParameterIntegerType} + //'Integer' ('{' 'default' default=ParameterInteger '}')? public Group getGroup() { return cGroup; } //{ParameterIntegerType} @@ -2165,7 +2244,8 @@ public class ParameterStringTypeElements extends AbstractParserRuleElementFinder // 'String' ('{' 'default' default=ParameterString '}')?; @Override public ParserRule getRule() { return rule; } - //{ParameterStringType} 'String' ('{' 'default' default=ParameterString '}')? + //{ParameterStringType} + //'String' ('{' 'default' default=ParameterString '}')? public Group getGroup() { return cGroup; } //{ParameterStringType} @@ -2209,7 +2289,8 @@ public class ParameterDoubleTypeElements extends AbstractParserRuleElementFinder // 'Double' ('{' 'default' default=ParameterDouble '}')?; @Override public ParserRule getRule() { return rule; } - //{ParameterDoubleType} 'Double' ('{' 'default' default=ParameterDouble '}')? + //{ParameterDoubleType} + //'Double' ('{' 'default' default=ParameterDouble '}')? public Group getGroup() { return cGroup; } //{ParameterDoubleType} @@ -2253,7 +2334,8 @@ public class ParameterDateTypeElements extends AbstractParserRuleElementFinder { // 'Date' ('{' 'default' default=ParameterDate '}')?; @Override public ParserRule getRule() { return rule; } - //{ParameterDateType} 'Date' ('{' 'default' default=ParameterDate '}')? + //{ParameterDateType} + //'Date' ('{' 'default' default=ParameterDate '}')? public Group getGroup() { return cGroup; } //{ParameterDateType} @@ -2297,7 +2379,8 @@ public class ParameterBooleanTypeElements extends AbstractParserRuleElementFinde // 'Boolean' ('{' 'default' default=ParameterBoolean '}')?; @Override public ParserRule getRule() { return rule; } - //{ParameterBooleanType} 'Boolean' ('{' 'default' default=ParameterBoolean '}')? + //{ParameterBooleanType} + //'Boolean' ('{' 'default' default=ParameterBoolean '}')? public Group getGroup() { return cGroup; } //{ParameterBooleanType} @@ -2341,7 +2424,8 @@ public class ParameterBase64TypeElements extends AbstractParserRuleElementFinder // 'Base64' ('{' 'default' default=ParameterBase64 '}')?; @Override public ParserRule getRule() { return rule; } - //{ParameterBase64Type} 'Base64' ('{' 'default' default=ParameterBase64 '}')? + //{ParameterBase64Type} + //'Base64' ('{' 'default' default=ParameterBase64 '}')? public Group getGroup() { return cGroup; } //{ParameterBase64Type} @@ -2385,7 +2469,8 @@ public class ParameterAnyTypeElements extends AbstractParserRuleElementFinder { // 'Any' ('{' 'default' default=ParameterAny '}')?; @Override public ParserRule getRule() { return rule; } - //{ParameterAnyType} 'Any' ('{' 'default' default=ParameterAny '}')? + //{ParameterAnyType} + //'Any' ('{' 'default' default=ParameterAny '}')? public Group getGroup() { return cGroup; } //{ParameterAnyType} @@ -2433,7 +2518,10 @@ public class ParameterArrayTypeElements extends AbstractParserRuleElementFinder // '}'; @Override public ParserRule getRule() { return rule; } - //'Array' '{' 'type' type=ParameterType ('default' default=ParameterList)? '}' + //'Array' + //'{' + //'type' type=ParameterType ('default' default=ParameterList)? + //'}' public Group getGroup() { return cGroup; } //'Array' @@ -2484,7 +2572,8 @@ public class ParameterListElements extends AbstractParserRuleElementFinder { // '{' value+=ParameterValue (',' value+=ParameterValue)* '}'; @Override public ParserRule getRule() { return rule; } - //{ParameterSequence} '{' value+=ParameterValue (',' value+=ParameterValue)* '}' + //{ParameterSequence} + //'{' value+=ParameterValue (',' value+=ParameterValue)* '}' public Group getGroup() { return cGroup; } //{ParameterSequence} @@ -2533,7 +2622,10 @@ public class ParameterAnyElements extends AbstractParserRuleElementFinder { // '}'; @Override public ParserRule getRule() { return rule; } - //{ParameterAny} 'ParameterAny' '{' ('value' value=EString)? '}' + //{ParameterAny} + //'ParameterAny' + //'{' ('value' value=EString)? + //'}' public Group getGroup() { return cGroup; } //{ParameterAny} @@ -2652,16 +2744,16 @@ public class ParameterStructElements extends AbstractParserRuleElementFinder { private final Keyword cRightCurlyBracketKeyword_1_3 = (Keyword)cGroup_1.eContents().get(3); //ParameterStruct: - // {ParameterStruct} ('{' value+=ParameterStructMember ("," '{' value+=ParameterStructMember '}')* '}')?; + // {ParameterStruct} ('{' value+=ParameterStructMember ("," '{' value+=ParameterStructMember '}')* '}')?; @Override public ParserRule getRule() { return rule; } - //{ParameterStruct} ('{' value+=ParameterStructMember ("," '{' value+=ParameterStructMember '}')* '}')? + //{ParameterStruct} ('{' value+=ParameterStructMember ("," '{' value+=ParameterStructMember '}')* '}')? public Group getGroup() { return cGroup; } //{ParameterStruct} public Action getParameterStructAction_0() { return cParameterStructAction_0; } - //('{' value+=ParameterStructMember ("," '{' value+=ParameterStructMember '}')* '}')? + //('{' value+=ParameterStructMember ("," '{' value+=ParameterStructMember '}')* '}')? public Group getGroup_1() { return cGroup_1; } //'{' @@ -2729,7 +2821,11 @@ public class ParameterStructMemberElements extends AbstractParserRuleElementFind // '}'; @Override public ParserRule getRule() { return rule; } - //'ParameterStructMember' name=EString '{' 'value' value=ParameterValue '}' + //'ParameterStructMember' + //name=EString + //'{' + //'value' value=ParameterValue + //'}' public Group getGroup() { return cGroup; } //'ParameterStructMember' @@ -2769,7 +2865,8 @@ public class ParameterStructTypeMemberElements extends AbstractParserRuleElement // type=ParameterType; @Override public ParserRule getRule() { return rule; } - //name=EString type=ParameterType + //name=EString + //type=ParameterType public Group getGroup() { return cGroup; } //name=EString @@ -2856,7 +2953,8 @@ public class MessagePartElements extends AbstractParserRuleElementFinder { // Data=(KEYWORD | MESSAGE_ASIGMENT | EString); @Override public ParserRule getRule() { return rule; } - //Type=AbstractType Data=(KEYWORD | MESSAGE_ASIGMENT | EString) + //Type=AbstractType + //Data=(KEYWORD | MESSAGE_ASIGMENT | EString) public Group getGroup() { return cGroup; } //Type=AbstractType @@ -2918,7 +3016,8 @@ public class AbstractTypeElements extends AbstractParserRuleElementFinder { //AbstractType primitives::AbstractType: // bool | int8 | uint8 | int16 | uint16 | int32 | uint32 | int64 | uint64 | float32 | float64 | string0 | byte | time | // duration | Header | boolArray | int8Array | uint8Array | int16Array | uint16Array | int32Array | uint32Array | - // int64Array | uint64Array | float32Array | float64Array | string0Array | byteArray | TopicSpecRef | ArrayTopicSpecRef; + // int64Array | uint64Array | float32Array | float64Array | string0Array | byteArray | TopicSpecRef | ArrayTopicSpecRef + //; @Override public ParserRule getRule() { return rule; } //bool | int8 | uint8 | int16 | uint16 | int32 | uint32 | int64 | uint64 | float32 | float64 | string0 | byte | time | @@ -3030,7 +3129,8 @@ public class BoolElements extends AbstractParserRuleElementFinder { // 'bool'; @Override public ParserRule getRule() { return rule; } - //{primitives::bool} 'bool' + //{primitives::bool} + //'bool' public Group getGroup() { return cGroup; } //{primitives::bool} @@ -3050,7 +3150,8 @@ public class Int8Elements extends AbstractParserRuleElementFinder { // 'int8'; @Override public ParserRule getRule() { return rule; } - //{primitives::int8} 'int8' + //{primitives::int8} + //'int8' public Group getGroup() { return cGroup; } //{primitives::int8} @@ -3070,7 +3171,8 @@ public class Uint8Elements extends AbstractParserRuleElementFinder { // 'uint8'; @Override public ParserRule getRule() { return rule; } - //{primitives::uint8} 'uint8' + //{primitives::uint8} + //'uint8' public Group getGroup() { return cGroup; } //{primitives::uint8} @@ -3090,7 +3192,8 @@ public class Int16Elements extends AbstractParserRuleElementFinder { // 'int16'; @Override public ParserRule getRule() { return rule; } - //{primitives::int16} 'int16' + //{primitives::int16} + //'int16' public Group getGroup() { return cGroup; } //{primitives::int16} @@ -3110,7 +3213,8 @@ public class Uint16Elements extends AbstractParserRuleElementFinder { // 'uint16'; @Override public ParserRule getRule() { return rule; } - //{primitives::uint16} 'uint16' + //{primitives::uint16} + //'uint16' public Group getGroup() { return cGroup; } //{primitives::uint16} @@ -3130,7 +3234,8 @@ public class Int32Elements extends AbstractParserRuleElementFinder { // 'int32'; @Override public ParserRule getRule() { return rule; } - //{primitives::int32} 'int32' + //{primitives::int32} + //'int32' public Group getGroup() { return cGroup; } //{primitives::int32} @@ -3150,7 +3255,8 @@ public class Uint32Elements extends AbstractParserRuleElementFinder { // 'uint32'; @Override public ParserRule getRule() { return rule; } - //{primitives::uint32} 'uint32' + //{primitives::uint32} + //'uint32' public Group getGroup() { return cGroup; } //{primitives::uint32} @@ -3170,7 +3276,8 @@ public class Int64Elements extends AbstractParserRuleElementFinder { // 'int64'; @Override public ParserRule getRule() { return rule; } - //{primitives::int64} 'int64' + //{primitives::int64} + //'int64' public Group getGroup() { return cGroup; } //{primitives::int64} @@ -3190,7 +3297,8 @@ public class Uint64Elements extends AbstractParserRuleElementFinder { // 'uint64'; @Override public ParserRule getRule() { return rule; } - //{primitives::uint64} 'uint64' + //{primitives::uint64} + //'uint64' public Group getGroup() { return cGroup; } //{primitives::uint64} @@ -3210,7 +3318,8 @@ public class Float32Elements extends AbstractParserRuleElementFinder { // 'float32'; @Override public ParserRule getRule() { return rule; } - //{primitives::float32} 'float32' + //{primitives::float32} + //'float32' public Group getGroup() { return cGroup; } //{primitives::float32} @@ -3230,7 +3339,8 @@ public class Float64Elements extends AbstractParserRuleElementFinder { // 'float64'; @Override public ParserRule getRule() { return rule; } - //{primitives::float64} 'float64' + //{primitives::float64} + //'float64' public Group getGroup() { return cGroup; } //{primitives::float64} @@ -3250,7 +3360,8 @@ public class String0Elements extends AbstractParserRuleElementFinder { // 'string'; @Override public ParserRule getRule() { return rule; } - //{primitives::string} 'string' + //{primitives::string} + //'string' public Group getGroup() { return cGroup; } //{primitives::string} @@ -3270,7 +3381,8 @@ public class ByteElements extends AbstractParserRuleElementFinder { // 'byte'; @Override public ParserRule getRule() { return rule; } - //{primitives::Byte} 'byte' + //{primitives::Byte} + //'byte' public Group getGroup() { return cGroup; } //{primitives::Byte} @@ -3290,7 +3402,8 @@ public class TimeElements extends AbstractParserRuleElementFinder { // 'time'; @Override public ParserRule getRule() { return rule; } - //{primitives::time} 'time' + //{primitives::time} + //'time' public Group getGroup() { return cGroup; } //{primitives::time} @@ -3310,7 +3423,8 @@ public class DurationElements extends AbstractParserRuleElementFinder { // 'duration'; @Override public ParserRule getRule() { return rule; } - //{primitives::duration} 'duration' + //{primitives::duration} + //'duration' public Group getGroup() { return cGroup; } //{primitives::duration} @@ -3330,7 +3444,8 @@ public class BoolArrayElements extends AbstractParserRuleElementFinder { // 'bool[]'; @Override public ParserRule getRule() { return rule; } - //{primitives::boolArray} 'bool[]' + //{primitives::boolArray} + //'bool[]' public Group getGroup() { return cGroup; } //{primitives::boolArray} @@ -3350,7 +3465,8 @@ public class Int8ArrayElements extends AbstractParserRuleElementFinder { // 'int8[]'; @Override public ParserRule getRule() { return rule; } - //{primitives::int8Array} 'int8[]' + //{primitives::int8Array} + //'int8[]' public Group getGroup() { return cGroup; } //{primitives::int8Array} @@ -3370,7 +3486,8 @@ public class Uint8ArrayElements extends AbstractParserRuleElementFinder { // 'uint8[]'; @Override public ParserRule getRule() { return rule; } - //{primitives::uint8Array} 'uint8[]' + //{primitives::uint8Array} + //'uint8[]' public Group getGroup() { return cGroup; } //{primitives::uint8Array} @@ -3390,7 +3507,8 @@ public class Int16ArrayElements extends AbstractParserRuleElementFinder { // 'int16[]'; @Override public ParserRule getRule() { return rule; } - //{primitives::int16Array} 'int16[]' + //{primitives::int16Array} + //'int16[]' public Group getGroup() { return cGroup; } //{primitives::int16Array} @@ -3410,7 +3528,8 @@ public class Uint16ArrayElements extends AbstractParserRuleElementFinder { // 'uint16[]'; @Override public ParserRule getRule() { return rule; } - //{primitives::uint16Array} 'uint16[]' + //{primitives::uint16Array} + //'uint16[]' public Group getGroup() { return cGroup; } //{primitives::uint16Array} @@ -3430,7 +3549,8 @@ public class Int32ArrayElements extends AbstractParserRuleElementFinder { // 'int32[]'; @Override public ParserRule getRule() { return rule; } - //{primitives::int32Array} 'int32[]' + //{primitives::int32Array} + //'int32[]' public Group getGroup() { return cGroup; } //{primitives::int32Array} @@ -3450,7 +3570,8 @@ public class Uint32ArrayElements extends AbstractParserRuleElementFinder { // 'uint32[]'; @Override public ParserRule getRule() { return rule; } - //{primitives::uint32Array} 'uint32[]' + //{primitives::uint32Array} + //'uint32[]' public Group getGroup() { return cGroup; } //{primitives::uint32Array} @@ -3470,7 +3591,8 @@ public class Int64ArrayElements extends AbstractParserRuleElementFinder { // 'int64[]'; @Override public ParserRule getRule() { return rule; } - //{primitives::int64Array} 'int64[]' + //{primitives::int64Array} + //'int64[]' public Group getGroup() { return cGroup; } //{primitives::int64Array} @@ -3490,7 +3612,8 @@ public class Uint64ArrayElements extends AbstractParserRuleElementFinder { // 'uint64[]'; @Override public ParserRule getRule() { return rule; } - //{primitives::uint64Array} 'uint64[]' + //{primitives::uint64Array} + //'uint64[]' public Group getGroup() { return cGroup; } //{primitives::uint64Array} @@ -3510,7 +3633,8 @@ public class Float32ArrayElements extends AbstractParserRuleElementFinder { // 'float32[]'; @Override public ParserRule getRule() { return rule; } - //{primitives::float32Array} 'float32[]' + //{primitives::float32Array} + //'float32[]' public Group getGroup() { return cGroup; } //{primitives::float32Array} @@ -3530,7 +3654,8 @@ public class Float64ArrayElements extends AbstractParserRuleElementFinder { // 'float64[]'; @Override public ParserRule getRule() { return rule; } - //{primitives::float64Array} 'float64[]' + //{primitives::float64Array} + //'float64[]' public Group getGroup() { return cGroup; } //{primitives::float64Array} @@ -3550,7 +3675,8 @@ public class String0ArrayElements extends AbstractParserRuleElementFinder { // 'string[]'; @Override public ParserRule getRule() { return rule; } - //{primitives::stringArray} 'string[]' + //{primitives::stringArray} + //'string[]' public Group getGroup() { return cGroup; } //{primitives::stringArray} @@ -3570,7 +3696,8 @@ public class ByteArrayElements extends AbstractParserRuleElementFinder { // 'byte[]'; @Override public ParserRule getRule() { return rule; } - //{primitives::ByteArray} 'byte[]' + //{primitives::ByteArray} + //'byte[]' public Group getGroup() { return cGroup; } //{primitives::ByteArray} @@ -3590,7 +3717,8 @@ public class HeaderElements extends AbstractParserRuleElementFinder { // 'Header'; @Override public ParserRule getRule() { return rule; } - //{primitives::Header} 'Header' + //{primitives::Header} + //'Header' public Group getGroup() { return cGroup; } //{primitives::Header} @@ -4079,8 +4207,8 @@ public ParserRule getArtifactRule() { // {CatkinPackage} // 'CatkinPackage' // name=RosNames - // '{' ('Specs' '{' spec+=SpecBase ("," spec+=SpecBase)* '}')? (artifact+=Artifact ("," artifact+=Artifact)*)? - // ('Dependencies' '{' dependency+=Dependency ("," dependency+=Dependency)* '}')? + // '{' ('Specs' '{' spec+=SpecBase ("," spec+=SpecBase)* '}')? (artifact+=Artifact ("," artifact+=Artifact)*)? ( + // 'Dependencies' '{' dependency+=Dependency ("," dependency+=Dependency)* '}')? // '}'; public CatkinPackageElements getCatkinPackageAccess() { return pCatkinPackage; @@ -4147,11 +4275,11 @@ public ParserRule getMessageDefinitionRule() { //Node: // 'Node' // '{' - // 'name' name=RosNames ('ServiceServers' '{' serviceserver+=ServiceServer ("," serviceserver+=ServiceServer)* '}')? - // ('Publishers' '{' publisher+=Publisher ("," publisher+=Publisher)* '}')? ('Subscribers' '{' subscriber+=Subscriber - // ("," subscriber+=Subscriber)* '}')? ('ServiceClients' '{' serviceclient+=ServiceClient ("," - // serviceclient+=ServiceClient)* '}')? ('ActionServers' '{' actionserver+=ActionServer ("," actionserver+=ActionServer)* - // '}')? ('ActionClients' '{' actionclient+=ActionClient ("," actionclient+=ActionClient)* '}')? ('Parameters' '{' + // 'name' name=RosNames ('ServiceServers' '{' serviceserver+=ServiceServer ("," serviceserver+=ServiceServer)* '}')? ( + // 'Publishers' '{' publisher+=Publisher ("," publisher+=Publisher)* '}')? ('Subscribers' '{' subscriber+=Subscriber ( + // "," subscriber+=Subscriber)* '}')? ('ServiceClients' '{' serviceclient+=ServiceClient ("," + // serviceclient+=ServiceClient)* '}')? ('ActionServers' '{' actionserver+=ActionServer ("," actionserver+=ActionServer) + // * '}')? ('ActionClients' '{' actionclient+=ActionClient ("," actionclient+=ActionClient)* '}')? ('Parameters' '{' // parameter+=Parameter ("," parameter+=Parameter)* '}')? // '}'; public NodeElements getNodeAccess() { @@ -4345,6 +4473,7 @@ public ParserRule getParameterTypeRule() { } //// | ParameterDateType; + // //ParameterValue: // ParameterString | ParameterBase64 | ParameterInteger | ParameterDouble | ParameterBoolean | ParameterList | // ParameterStruct; @@ -4357,6 +4486,7 @@ public ParserRule getParameterValueRule() { } //// | ParameterDate; + // //ParameterListType: // {ParameterListType} // 'List' @@ -4550,7 +4680,7 @@ public ParserRule getParameterBooleanRule() { } //ParameterStruct: - // {ParameterStruct} ('{' value+=ParameterStructMember ("," '{' value+=ParameterStructMember '}')* '}')?; + // {ParameterStruct} ('{' value+=ParameterStructMember ("," '{' value+=ParameterStructMember '}')* '}')?; public ParameterStructElements getParameterStructAccess() { return pParameterStruct; } @@ -4643,13 +4773,13 @@ public TerminalRule getYEARRule() { } //terminal HOUR: - // '0'..'1' '0'..'9' | '2' '0'..'3'; + // '0'..'1''0'..'9' | '2''0'..'3'; public TerminalRule getHOURRule() { return tHOUR; } //terminal MIN_SEC: - // '0'..'5' '0'..'9'; + // '0'..'5''0'..'9'; public TerminalRule getMIN_SECRule() { return tMIN_SEC; } @@ -4723,7 +4853,7 @@ public ParserRule getMessagePartRule() { } //terminal MESSAGE_ASIGMENT: - // (ID | STRING) '=' (ID | STRING | INT | '-' INT); + // (ID | STRING) '=' (ID | STRING | INT | '-'INT); public TerminalRule getMESSAGE_ASIGMENTRule() { return tMESSAGE_ASIGMENT; } @@ -4731,7 +4861,8 @@ public TerminalRule getMESSAGE_ASIGMENTRule() { //AbstractType primitives::AbstractType: // bool | int8 | uint8 | int16 | uint16 | int32 | uint32 | int64 | uint64 | float32 | float64 | string0 | byte | time | // duration | Header | boolArray | int8Array | uint8Array | int16Array | uint16Array | int32Array | uint32Array | - // int64Array | uint64Array | float32Array | float64Array | string0Array | byteArray | TopicSpecRef | ArrayTopicSpecRef; + // int64Array | uint64Array | float32Array | float64Array | string0Array | byteArray | TopicSpecRef | ArrayTopicSpecRef + //; public AbstractTypeElements getAbstractTypeAccess() { return pAbstractType; }