0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

eclipse plugin: wml grammar - add syntax highlighting for macros

Browse source
This commit is contained in:
Timotei Dolean 2010-07-12 19:20:37 +00:00
parent 8687ee7110
commit a183764ae8
19 changed files with 424 additions and 401 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
utils/java/org.wesnoth.wml.ui/src-gen/org/wesnoth/ui/contentassist/AbstractWMLProposalProvider.java
View file

@ -23,10 +23,10 @@ public class AbstractWMLProposalProvider extends AbstractJavaBasedContentProposa
public void completeWMLRoot_Rmacros(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
}
public void completeWMLMacro_MacroName(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
public void completeWMLMacro_Name(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
}
public void completeWMLMacro_Tagcontent(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
public void completeWMLMacro_Value(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
completeRuleCall(((RuleCall)((Alternatives)assignment.getTerminal()).getElements().get(0)), context, acceptor);
completeRuleCall(((RuleCall)((Alternatives)assignment.getTerminal()).getElements().get(1)), context, acceptor);
// subclasses may override

6
utils/java/org.wesnoth.wml.ui/src-gen/org/wesnoth/ui/contentassist/antlr/WMLParser.java
View file

@ -38,7 +38,7 @@ public class WMLParser extends AbstractContentAssistParser {
private static final long serialVersionUID = 1L;
{
put(grammarAccess.getWMLRootAccess().getAlternatives(), "rule__WMLRoot__Alternatives");
put(grammarAccess.getWMLMacroAccess().getTagcontentAlternatives_2_0(), "rule__WMLMacro__TagcontentAlternatives_2_0");
put(grammarAccess.getWMLMacroAccess().getValueAlternatives_2_0(), "rule__WMLMacro__ValueAlternatives_2_0");
put(grammarAccess.getWMLTagAccess().getAlternatives_3(), "rule__WMLTag__Alternatives_3");
put(grammarAccess.getWMLKeyValueAccess().getAlternatives(), "rule__WMLKeyValue__Alternatives");
put(grammarAccess.getWMLKeyValueAccess().getKey1ValueAlternatives_0_0(), "rule__WMLKeyValue__Key1ValueAlternatives_0_0");
@ -68,8 +68,8 @@ public class WMLParser extends AbstractContentAssistParser {
put(grammarAccess.getPROGRESSIVEAccess().getGroup_3_3(), "rule__PROGRESSIVE__Group_3_3__0");
put(grammarAccess.getWMLRootAccess().getRtagsAssignment_0(), "rule__WMLRoot__RtagsAssignment_0");
put(grammarAccess.getWMLRootAccess().getRmacrosAssignment_1(), "rule__WMLRoot__RmacrosAssignment_1");
put(grammarAccess.getWMLMacroAccess().getMacroNameAssignment_1(), "rule__WMLMacro__MacroNameAssignment_1");
put(grammarAccess.getWMLMacroAccess().getTagcontentAssignment_2(), "rule__WMLMacro__TagcontentAssignment_2");
put(grammarAccess.getWMLMacroAccess().getNameAssignment_1(), "rule__WMLMacro__NameAssignment_1");
put(grammarAccess.getWMLMacroAccess().getValueAssignment_2(), "rule__WMLMacro__ValueAssignment_2");
put(grammarAccess.getWMLTagAccess().getNameAssignment_1(), "rule__WMLTag__NameAssignment_1");
put(grammarAccess.getWMLTagAccess().getTtagsAssignment_3_0(), "rule__WMLTag__TtagsAssignment_3_0");
put(grammarAccess.getWMLTagAccess().getTkeysAssignment_3_1(), "rule__WMLTag__TkeysAssignment_3_1");

68
utils/java/org.wesnoth.wml.ui/src-gen/org/wesnoth/ui/contentassist/antlr/internal/InternalWML.g
View file

@ -431,85 +431,85 @@ finally {
restoreStackSize(stackSize);
}
rule__WMLMacro__TagcontentAlternatives_2_0
rule__WMLMacro__ValueAlternatives_2_0
@init {
int stackSize = keepStackSize();
}
:
(
{ before(grammarAccess.getWMLMacroAccess().getTagcontentIDTerminalRuleCall_2_0_0()); }
{ before(grammarAccess.getWMLMacroAccess().getValueIDTerminalRuleCall_2_0_0()); }
RULE_ID
{ after(grammarAccess.getWMLMacroAccess().getTagcontentIDTerminalRuleCall_2_0_0()); }
{ after(grammarAccess.getWMLMacroAccess().getValueIDTerminalRuleCall_2_0_0()); }
)
|(
{ before(grammarAccess.getWMLMacroAccess().getTagcontentSTRINGTerminalRuleCall_2_0_1()); }
{ before(grammarAccess.getWMLMacroAccess().getValueSTRINGTerminalRuleCall_2_0_1()); }
RULE_STRING
{ after(grammarAccess.getWMLMacroAccess().getTagcontentSTRINGTerminalRuleCall_2_0_1()); }
{ after(grammarAccess.getWMLMacroAccess().getValueSTRINGTerminalRuleCall_2_0_1()); }
)
|(
{ before(grammarAccess.getWMLMacroAccess().getTagcontent_Keyword_2_0_2()); }
{ before(grammarAccess.getWMLMacroAccess().getValue_Keyword_2_0_2()); }
'_'
{ after(grammarAccess.getWMLMacroAccess().getTagcontent_Keyword_2_0_2()); }
{ after(grammarAccess.getWMLMacroAccess().getValue_Keyword_2_0_2()); }
)
|(
{ before(grammarAccess.getWMLMacroAccess().getTagcontentColonKeyword_2_0_3()); }
{ before(grammarAccess.getWMLMacroAccess().getValueColonKeyword_2_0_3()); }
':'
{ after(grammarAccess.getWMLMacroAccess().getTagcontentColonKeyword_2_0_3()); }
{ after(grammarAccess.getWMLMacroAccess().getValueColonKeyword_2_0_3()); }
)
|(
{ before(grammarAccess.getWMLMacroAccess().getTagcontentHyphenMinusKeyword_2_0_4()); }
{ before(grammarAccess.getWMLMacroAccess().getValueHyphenMinusKeyword_2_0_4()); }
'-'
{ after(grammarAccess.getWMLMacroAccess().getTagcontentHyphenMinusKeyword_2_0_4()); }
{ after(grammarAccess.getWMLMacroAccess().getValueHyphenMinusKeyword_2_0_4()); }
)
|(
{ before(grammarAccess.getWMLMacroAccess().getTagcontentFullStopKeyword_2_0_5()); }
{ before(grammarAccess.getWMLMacroAccess().getValueFullStopKeyword_2_0_5()); }
'.'
{ after(grammarAccess.getWMLMacroAccess().getTagcontentFullStopKeyword_2_0_5()); }
{ after(grammarAccess.getWMLMacroAccess().getValueFullStopKeyword_2_0_5()); }
)
|(
{ before(grammarAccess.getWMLMacroAccess().getTagcontentLeftParenthesisKeyword_2_0_6()); }
{ before(grammarAccess.getWMLMacroAccess().getValueLeftParenthesisKeyword_2_0_6()); }
'('
{ after(grammarAccess.getWMLMacroAccess().getTagcontentLeftParenthesisKeyword_2_0_6()); }
{ after(grammarAccess.getWMLMacroAccess().getValueLeftParenthesisKeyword_2_0_6()); }
)
|(
{ before(grammarAccess.getWMLMacroAccess().getTagcontentRightParenthesisKeyword_2_0_7()); }
{ before(grammarAccess.getWMLMacroAccess().getValueRightParenthesisKeyword_2_0_7()); }
')'
{ after(grammarAccess.getWMLMacroAccess().getTagcontentRightParenthesisKeyword_2_0_7()); }
{ after(grammarAccess.getWMLMacroAccess().getValueRightParenthesisKeyword_2_0_7()); }
)
|(
{ before(grammarAccess.getWMLMacroAccess().getTagcontentEqualsSignKeyword_2_0_8()); }
{ before(grammarAccess.getWMLMacroAccess().getValueEqualsSignKeyword_2_0_8()); }
'='
{ after(grammarAccess.getWMLMacroAccess().getTagcontentEqualsSignKeyword_2_0_8()); }
{ after(grammarAccess.getWMLMacroAccess().getValueEqualsSignKeyword_2_0_8()); }
)
|(
{ before(grammarAccess.getWMLMacroAccess().getTagcontentSolidusKeyword_2_0_9()); }
{ before(grammarAccess.getWMLMacroAccess().getValueSolidusKeyword_2_0_9()); }
'/'
{ after(grammarAccess.getWMLMacroAccess().getTagcontentSolidusKeyword_2_0_9()); }
{ after(grammarAccess.getWMLMacroAccess().getValueSolidusKeyword_2_0_9()); }
)
;
@ -870,9 +870,9 @@ rule__WMLMacro__Group__1__Impl
}
:
(
{ before(grammarAccess.getWMLMacroAccess().getMacroNameAssignment_1()); }
(rule__WMLMacro__MacroNameAssignment_1)
{ after(grammarAccess.getWMLMacroAccess().getMacroNameAssignment_1()); }
{ before(grammarAccess.getWMLMacroAccess().getNameAssignment_1()); }
(rule__WMLMacro__NameAssignment_1)
{ after(grammarAccess.getWMLMacroAccess().getNameAssignment_1()); }
)
;
@ -899,9 +899,9 @@ rule__WMLMacro__Group__2__Impl
}
:
(
{ before(grammarAccess.getWMLMacroAccess().getTagcontentAssignment_2()); }
(rule__WMLMacro__TagcontentAssignment_2)*
{ after(grammarAccess.getWMLMacroAccess().getTagcontentAssignment_2()); }
{ before(grammarAccess.getWMLMacroAccess().getValueAssignment_2()); }
(rule__WMLMacro__ValueAssignment_2)*
{ after(grammarAccess.getWMLMacroAccess().getValueAssignment_2()); }
)
;
@ -2495,14 +2495,14 @@ finally {
restoreStackSize(stackSize);
}
rule__WMLMacro__MacroNameAssignment_1
rule__WMLMacro__NameAssignment_1
@init {
int stackSize = keepStackSize();
}
:
(
{ before(grammarAccess.getWMLMacroAccess().getMacroNameIDTerminalRuleCall_1_0()); }
RULE_ID{ after(grammarAccess.getWMLMacroAccess().getMacroNameIDTerminalRuleCall_1_0()); }
{ before(grammarAccess.getWMLMacroAccess().getNameIDTerminalRuleCall_1_0()); }
RULE_ID{ after(grammarAccess.getWMLMacroAccess().getNameIDTerminalRuleCall_1_0()); }
)
;
@ -2510,15 +2510,15 @@ finally {
restoreStackSize(stackSize);
}
rule__WMLMacro__TagcontentAssignment_2
rule__WMLMacro__ValueAssignment_2
@init {
int stackSize = keepStackSize();
}
:
(
{ before(grammarAccess.getWMLMacroAccess().getTagcontentAlternatives_2_0()); }
(rule__WMLMacro__TagcontentAlternatives_2_0)
{ after(grammarAccess.getWMLMacroAccess().getTagcontentAlternatives_2_0()); }
{ before(grammarAccess.getWMLMacroAccess().getValueAlternatives_2_0()); }
(rule__WMLMacro__ValueAlternatives_2_0)
{ after(grammarAccess.getWMLMacroAccess().getValueAlternatives_2_0()); }
)
;

184
utils/java/org.wesnoth.wml.ui/src-gen/org/wesnoth/ui/contentassist/antlr/internal/InternalWMLParser.java
View file

@ -1118,9 +1118,9 @@ public class InternalWMLParser extends AbstractInternalContentAssistParser {
// $ANTLR end rule__WMLRoot__Alternatives
// $ANTLR start rule__WMLMacro__TagcontentAlternatives_2_0
// ../org.wesnoth.wml.ui/src-gen/org/wesnoth/ui/contentassist/antlr/internal/InternalWML.g:434:1: rule__WMLMacro__TagcontentAlternatives_2_0 : ( ( RULE_ID ) | ( RULE_STRING ) | ( '_' ) | ( ':' ) | ( '-' ) | ( '.' ) | ( '(' ) | ( ')' ) | ( '=' ) | ( '/' ) );
public final void rule__WMLMacro__TagcontentAlternatives_2_0() throws RecognitionException {
// $ANTLR start rule__WMLMacro__ValueAlternatives_2_0
// ../org.wesnoth.wml.ui/src-gen/org/wesnoth/ui/contentassist/antlr/internal/InternalWML.g:434:1: rule__WMLMacro__ValueAlternatives_2_0 : ( ( RULE_ID ) | ( RULE_STRING ) | ( '_' ) | ( ':' ) | ( '-' ) | ( '.' ) | ( '(' ) | ( ')' ) | ( '=' ) | ( '/' ) );
public final void rule__WMLMacro__ValueAlternatives_2_0() throws RecognitionException {
int stackSize = keepStackSize();
@ -1180,7 +1180,7 @@ public class InternalWMLParser extends AbstractInternalContentAssistParser {
break;
default:
NoViableAltException nvae =
new NoViableAltException("434:1: rule__WMLMacro__TagcontentAlternatives_2_0 : ( ( RULE_ID ) | ( RULE_STRING ) | ( '_' ) | ( ':' ) | ( '-' ) | ( '.' ) | ( '(' ) | ( ')' ) | ( '=' ) | ( '/' ) );", 4, 0, input);
new NoViableAltException("434:1: rule__WMLMacro__ValueAlternatives_2_0 : ( ( RULE_ID ) | ( RULE_STRING ) | ( '_' ) | ( ':' ) | ( '-' ) | ( '.' ) | ( '(' ) | ( ')' ) | ( '=' ) | ( '/' ) );", 4, 0, input);
throw nvae;
}
@ -1192,9 +1192,9 @@ public class InternalWMLParser extends AbstractInternalContentAssistParser {
// ../org.wesnoth.wml.ui/src-gen/org/wesnoth/ui/contentassist/antlr/internal/InternalWML.g:439:1: ( RULE_ID )
// ../org.wesnoth.wml.ui/src-gen/org/wesnoth/ui/contentassist/antlr/internal/InternalWML.g:440:1: RULE_ID
{
before(grammarAccess.getWMLMacroAccess().getTagcontentIDTerminalRuleCall_2_0_0());
match(input,RULE_ID,FOLLOW_RULE_ID_in_rule__WMLMacro__TagcontentAlternatives_2_0868);
after(grammarAccess.getWMLMacroAccess().getTagcontentIDTerminalRuleCall_2_0_0());
before(grammarAccess.getWMLMacroAccess().getValueIDTerminalRuleCall_2_0_0());
match(input,RULE_ID,FOLLOW_RULE_ID_in_rule__WMLMacro__ValueAlternatives_2_0868);
after(grammarAccess.getWMLMacroAccess().getValueIDTerminalRuleCall_2_0_0());
}
@ -1207,9 +1207,9 @@ public class InternalWMLParser extends AbstractInternalContentAssistParser {
// ../org.wesnoth.wml.ui/src-gen/org/wesnoth/ui/contentassist/antlr/internal/InternalWML.g:445:6: ( RULE_STRING )
// ../org.wesnoth.wml.ui/src-gen/org/wesnoth/ui/contentassist/antlr/internal/InternalWML.g:446:1: RULE_STRING
{
before(grammarAccess.getWMLMacroAccess().getTagcontentSTRINGTerminalRuleCall_2_0_1());
match(input,RULE_STRING,FOLLOW_RULE_STRING_in_rule__WMLMacro__TagcontentAlternatives_2_0885);
after(grammarAccess.getWMLMacroAccess().getTagcontentSTRINGTerminalRuleCall_2_0_1());
before(grammarAccess.getWMLMacroAccess().getValueSTRINGTerminalRuleCall_2_0_1());
match(input,RULE_STRING,FOLLOW_RULE_STRING_in_rule__WMLMacro__ValueAlternatives_2_0885);
after(grammarAccess.getWMLMacroAccess().getValueSTRINGTerminalRuleCall_2_0_1());
}
@ -1222,9 +1222,9 @@ public class InternalWMLParser extends AbstractInternalContentAssistParser {
// ../org.wesnoth.wml.ui/src-gen/org/wesnoth/ui/contentassist/antlr/internal/InternalWML.g:451:6: ( '_' )
// ../org.wesnoth.wml.ui/src-gen/org/wesnoth/ui/contentassist/antlr/internal/InternalWML.g:452:1: '_'
{
before(grammarAccess.getWMLMacroAccess().getTagcontent_Keyword_2_0_2());
match(input,9,FOLLOW_9_in_rule__WMLMacro__TagcontentAlternatives_2_0903);
after(grammarAccess.getWMLMacroAccess().getTagcontent_Keyword_2_0_2());
before(grammarAccess.getWMLMacroAccess().getValue_Keyword_2_0_2());
match(input,9,FOLLOW_9_in_rule__WMLMacro__ValueAlternatives_2_0903);
after(grammarAccess.getWMLMacroAccess().getValue_Keyword_2_0_2());
}
@ -1237,9 +1237,9 @@ public class InternalWMLParser extends AbstractInternalContentAssistParser {
// ../org.wesnoth.wml.ui/src-gen/org/wesnoth/ui/contentassist/antlr/internal/InternalWML.g:459:6: ( ':' )
// ../org.wesnoth.wml.ui/src-gen/org/wesnoth/ui/contentassist/antlr/internal/InternalWML.g:460:1: ':'
{
before(grammarAccess.getWMLMacroAccess().getTagcontentColonKeyword_2_0_3());
match(input,10,FOLLOW_10_in_rule__WMLMacro__TagcontentAlternatives_2_0923);
after(grammarAccess.getWMLMacroAccess().getTagcontentColonKeyword_2_0_3());
before(grammarAccess.getWMLMacroAccess().getValueColonKeyword_2_0_3());
match(input,10,FOLLOW_10_in_rule__WMLMacro__ValueAlternatives_2_0923);
after(grammarAccess.getWMLMacroAccess().getValueColonKeyword_2_0_3());
}
@ -1252,9 +1252,9 @@ public class InternalWMLParser extends AbstractInternalContentAssistParser {
// ../org.wesnoth.wml.ui/src-gen/org/wesnoth/ui/contentassist/antlr/internal/InternalWML.g:467:6: ( '-' )
// ../org.wesnoth.wml.ui/src-gen/org/wesnoth/ui/contentassist/antlr/internal/InternalWML.g:468:1: '-'
{
before(grammarAccess.getWMLMacroAccess().getTagcontentHyphenMinusKeyword_2_0_4());
match(input,11,FOLLOW_11_in_rule__WMLMacro__TagcontentAlternatives_2_0943);
after(grammarAccess.getWMLMacroAccess().getTagcontentHyphenMinusKeyword_2_0_4());
before(grammarAccess.getWMLMacroAccess().getValueHyphenMinusKeyword_2_0_4());
match(input,11,FOLLOW_11_in_rule__WMLMacro__ValueAlternatives_2_0943);
after(grammarAccess.getWMLMacroAccess().getValueHyphenMinusKeyword_2_0_4());
}
@ -1267,9 +1267,9 @@ public class InternalWMLParser extends AbstractInternalContentAssistParser {
// ../org.wesnoth.wml.ui/src-gen/org/wesnoth/ui/contentassist/antlr/internal/InternalWML.g:475:6: ( '.' )
// ../org.wesnoth.wml.ui/src-gen/org/wesnoth/ui/contentassist/antlr/internal/InternalWML.g:476:1: '.'
{
before(grammarAccess.getWMLMacroAccess().getTagcontentFullStopKeyword_2_0_5());
match(input,12,FOLLOW_12_in_rule__WMLMacro__TagcontentAlternatives_2_0963);
after(grammarAccess.getWMLMacroAccess().getTagcontentFullStopKeyword_2_0_5());
before(grammarAccess.getWMLMacroAccess().getValueFullStopKeyword_2_0_5());
match(input,12,FOLLOW_12_in_rule__WMLMacro__ValueAlternatives_2_0963);
after(grammarAccess.getWMLMacroAccess().getValueFullStopKeyword_2_0_5());
}
@ -1282,9 +1282,9 @@ public class InternalWMLParser extends AbstractInternalContentAssistParser {
// ../org.wesnoth.wml.ui/src-gen/org/wesnoth/ui/contentassist/antlr/internal/InternalWML.g:483:6: ( '(' )
// ../org.wesnoth.wml.ui/src-gen/org/wesnoth/ui/contentassist/antlr/internal/InternalWML.g:484:1: '('
{
before(grammarAccess.getWMLMacroAccess().getTagcontentLeftParenthesisKeyword_2_0_6());
match(input,13,FOLLOW_13_in_rule__WMLMacro__TagcontentAlternatives_2_0983);
after(grammarAccess.getWMLMacroAccess().getTagcontentLeftParenthesisKeyword_2_0_6());
before(grammarAccess.getWMLMacroAccess().getValueLeftParenthesisKeyword_2_0_6());
match(input,13,FOLLOW_13_in_rule__WMLMacro__ValueAlternatives_2_0983);
after(grammarAccess.getWMLMacroAccess().getValueLeftParenthesisKeyword_2_0_6());
}
@ -1297,9 +1297,9 @@ public class InternalWMLParser extends AbstractInternalContentAssistParser {
// ../org.wesnoth.wml.ui/src-gen/org/wesnoth/ui/contentassist/antlr/internal/InternalWML.g:491:6: ( ')' )
// ../org.wesnoth.wml.ui/src-gen/org/wesnoth/ui/contentassist/antlr/internal/InternalWML.g:492:1: ')'
{
before(grammarAccess.getWMLMacroAccess().getTagcontentRightParenthesisKeyword_2_0_7());
match(input,14,FOLLOW_14_in_rule__WMLMacro__TagcontentAlternatives_2_01003);
after(grammarAccess.getWMLMacroAccess().getTagcontentRightParenthesisKeyword_2_0_7());
before(grammarAccess.getWMLMacroAccess().getValueRightParenthesisKeyword_2_0_7());
match(input,14,FOLLOW_14_in_rule__WMLMacro__ValueAlternatives_2_01003);
after(grammarAccess.getWMLMacroAccess().getValueRightParenthesisKeyword_2_0_7());
}
@ -1312,9 +1312,9 @@ public class InternalWMLParser extends AbstractInternalContentAssistParser {
// ../org.wesnoth.wml.ui/src-gen/org/wesnoth/ui/contentassist/antlr/internal/InternalWML.g:499:6: ( '=' )
// ../org.wesnoth.wml.ui/src-gen/org/wesnoth/ui/contentassist/antlr/internal/InternalWML.g:500:1: '='
{
before(grammarAccess.getWMLMacroAccess().getTagcontentEqualsSignKeyword_2_0_8());
match(input,15,FOLLOW_15_in_rule__WMLMacro__TagcontentAlternatives_2_01023);
after(grammarAccess.getWMLMacroAccess().getTagcontentEqualsSignKeyword_2_0_8());
before(grammarAccess.getWMLMacroAccess().getValueEqualsSignKeyword_2_0_8());
match(input,15,FOLLOW_15_in_rule__WMLMacro__ValueAlternatives_2_01023);
after(grammarAccess.getWMLMacroAccess().getValueEqualsSignKeyword_2_0_8());
}
@ -1327,9 +1327,9 @@ public class InternalWMLParser extends AbstractInternalContentAssistParser {
// ../org.wesnoth.wml.ui/src-gen/org/wesnoth/ui/contentassist/antlr/internal/InternalWML.g:507:6: ( '/' )
// ../org.wesnoth.wml.ui/src-gen/org/wesnoth/ui/contentassist/antlr/internal/InternalWML.g:508:1: '/'
{
before(grammarAccess.getWMLMacroAccess().getTagcontentSolidusKeyword_2_0_9());
match(input,16,FOLLOW_16_in_rule__WMLMacro__TagcontentAlternatives_2_01043);
after(grammarAccess.getWMLMacroAccess().getTagcontentSolidusKeyword_2_0_9());
before(grammarAccess.getWMLMacroAccess().getValueSolidusKeyword_2_0_9());
match(input,16,FOLLOW_16_in_rule__WMLMacro__ValueAlternatives_2_01043);
after(grammarAccess.getWMLMacroAccess().getValueSolidusKeyword_2_0_9());
}
@ -1350,7 +1350,7 @@ public class InternalWMLParser extends AbstractInternalContentAssistParser {
}
return ;
}
// $ANTLR end rule__WMLMacro__TagcontentAlternatives_2_0
// $ANTLR end rule__WMLMacro__ValueAlternatives_2_0
// $ANTLR start rule__WMLTag__Alternatives_3
@ -2457,30 +2457,30 @@ public class InternalWMLParser extends AbstractInternalContentAssistParser {
// $ANTLR start rule__WMLMacro__Group__1__Impl
// ../org.wesnoth.wml.ui/src-gen/org/wesnoth/ui/contentassist/antlr/internal/InternalWML.g:867:1: rule__WMLMacro__Group__1__Impl : ( ( rule__WMLMacro__MacroNameAssignment_1 ) ) ;
// ../org.wesnoth.wml.ui/src-gen/org/wesnoth/ui/contentassist/antlr/internal/InternalWML.g:867:1: rule__WMLMacro__Group__1__Impl : ( ( rule__WMLMacro__NameAssignment_1 ) ) ;
public final void rule__WMLMacro__Group__1__Impl() throws RecognitionException {
int stackSize = keepStackSize();
try {
// ../org.wesnoth.wml.ui/src-gen/org/wesnoth/ui/contentassist/antlr/internal/InternalWML.g:871:1: ( ( ( rule__WMLMacro__MacroNameAssignment_1 ) ) )
// ../org.wesnoth.wml.ui/src-gen/org/wesnoth/ui/contentassist/antlr/internal/InternalWML.g:872:1: ( ( rule__WMLMacro__MacroNameAssignment_1 ) )
// ../org.wesnoth.wml.ui/src-gen/org/wesnoth/ui/contentassist/antlr/internal/InternalWML.g:871:1: ( ( ( rule__WMLMacro__NameAssignment_1 ) ) )
// ../org.wesnoth.wml.ui/src-gen/org/wesnoth/ui/contentassist/antlr/internal/InternalWML.g:872:1: ( ( rule__WMLMacro__NameAssignment_1 ) )
{
// ../org.wesnoth.wml.ui/src-gen/org/wesnoth/ui/contentassist/antlr/internal/InternalWML.g:872:1: ( ( rule__WMLMacro__MacroNameAssignment_1 ) )
// ../org.wesnoth.wml.ui/src-gen/org/wesnoth/ui/contentassist/antlr/internal/InternalWML.g:873:1: ( rule__WMLMacro__MacroNameAssignment_1 )
// ../org.wesnoth.wml.ui/src-gen/org/wesnoth/ui/contentassist/antlr/internal/InternalWML.g:872:1: ( ( rule__WMLMacro__NameAssignment_1 ) )
// ../org.wesnoth.wml.ui/src-gen/org/wesnoth/ui/contentassist/antlr/internal/InternalWML.g:873:1: ( rule__WMLMacro__NameAssignment_1 )
{
before(grammarAccess.getWMLMacroAccess().getMacroNameAssignment_1());
// ../org.wesnoth.wml.ui/src-gen/org/wesnoth/ui/contentassist/antlr/internal/InternalWML.g:874:1: ( rule__WMLMacro__MacroNameAssignment_1 )
// ../org.wesnoth.wml.ui/src-gen/org/wesnoth/ui/contentassist/antlr/internal/InternalWML.g:874:2: rule__WMLMacro__MacroNameAssignment_1
before(grammarAccess.getWMLMacroAccess().getNameAssignment_1());
// ../org.wesnoth.wml.ui/src-gen/org/wesnoth/ui/contentassist/antlr/internal/InternalWML.g:874:1: ( rule__WMLMacro__NameAssignment_1 )
// ../org.wesnoth.wml.ui/src-gen/org/wesnoth/ui/contentassist/antlr/internal/InternalWML.g:874:2: rule__WMLMacro__NameAssignment_1
{
pushFollow(FOLLOW_rule__WMLMacro__MacroNameAssignment_1_in_rule__WMLMacro__Group__1__Impl1881);
rule__WMLMacro__MacroNameAssignment_1();
pushFollow(FOLLOW_rule__WMLMacro__NameAssignment_1_in_rule__WMLMacro__Group__1__Impl1881);
rule__WMLMacro__NameAssignment_1();
_fsp--;
}
after(grammarAccess.getWMLMacroAccess().getMacroNameAssignment_1());
after(grammarAccess.getWMLMacroAccess().getNameAssignment_1());
}
@ -2539,20 +2539,20 @@ public class InternalWMLParser extends AbstractInternalContentAssistParser {
// $ANTLR start rule__WMLMacro__Group__2__Impl
// ../org.wesnoth.wml.ui/src-gen/org/wesnoth/ui/contentassist/antlr/internal/InternalWML.g:896:1: rule__WMLMacro__Group__2__Impl : ( ( rule__WMLMacro__TagcontentAssignment_2 )* ) ;
// ../org.wesnoth.wml.ui/src-gen/org/wesnoth/ui/contentassist/antlr/internal/InternalWML.g:896:1: rule__WMLMacro__Group__2__Impl : ( ( rule__WMLMacro__ValueAssignment_2 )* ) ;
public final void rule__WMLMacro__Group__2__Impl() throws RecognitionException {
int stackSize = keepStackSize();
try {
// ../org.wesnoth.wml.ui/src-gen/org/wesnoth/ui/contentassist/antlr/internal/InternalWML.g:900:1: ( ( ( rule__WMLMacro__TagcontentAssignment_2 )* ) )
// ../org.wesnoth.wml.ui/src-gen/org/wesnoth/ui/contentassist/antlr/internal/InternalWML.g:901:1: ( ( rule__WMLMacro__TagcontentAssignment_2 )* )
// ../org.wesnoth.wml.ui/src-gen/org/wesnoth/ui/contentassist/antlr/internal/InternalWML.g:900:1: ( ( ( rule__WMLMacro__ValueAssignment_2 )* ) )
// ../org.wesnoth.wml.ui/src-gen/org/wesnoth/ui/contentassist/antlr/internal/InternalWML.g:901:1: ( ( rule__WMLMacro__ValueAssignment_2 )* )
{
// ../org.wesnoth.wml.ui/src-gen/org/wesnoth/ui/contentassist/antlr/internal/InternalWML.g:901:1: ( ( rule__WMLMacro__TagcontentAssignment_2 )* )
// ../org.wesnoth.wml.ui/src-gen/org/wesnoth/ui/contentassist/antlr/internal/InternalWML.g:902:1: ( rule__WMLMacro__TagcontentAssignment_2 )*
// ../org.wesnoth.wml.ui/src-gen/org/wesnoth/ui/contentassist/antlr/internal/InternalWML.g:901:1: ( ( rule__WMLMacro__ValueAssignment_2 )* )
// ../org.wesnoth.wml.ui/src-gen/org/wesnoth/ui/contentassist/antlr/internal/InternalWML.g:902:1: ( rule__WMLMacro__ValueAssignment_2 )*
{
before(grammarAccess.getWMLMacroAccess().getTagcontentAssignment_2());
// ../org.wesnoth.wml.ui/src-gen/org/wesnoth/ui/contentassist/antlr/internal/InternalWML.g:903:1: ( rule__WMLMacro__TagcontentAssignment_2 )*
before(grammarAccess.getWMLMacroAccess().getValueAssignment_2());
// ../org.wesnoth.wml.ui/src-gen/org/wesnoth/ui/contentassist/antlr/internal/InternalWML.g:903:1: ( rule__WMLMacro__ValueAssignment_2 )*
loop14:
do {
int alt14=2;
@ -2565,10 +2565,10 @@ public class InternalWMLParser extends AbstractInternalContentAssistParser {
switch (alt14) {
case 1 :
// ../org.wesnoth.wml.ui/src-gen/org/wesnoth/ui/contentassist/antlr/internal/InternalWML.g:903:2: rule__WMLMacro__TagcontentAssignment_2
// ../org.wesnoth.wml.ui/src-gen/org/wesnoth/ui/contentassist/antlr/internal/InternalWML.g:903:2: rule__WMLMacro__ValueAssignment_2
{
pushFollow(FOLLOW_rule__WMLMacro__TagcontentAssignment_2_in_rule__WMLMacro__Group__2__Impl1941);
rule__WMLMacro__TagcontentAssignment_2();
pushFollow(FOLLOW_rule__WMLMacro__ValueAssignment_2_in_rule__WMLMacro__Group__2__Impl1941);
rule__WMLMacro__ValueAssignment_2();
_fsp--;
@ -2580,7 +2580,7 @@ public class InternalWMLParser extends AbstractInternalContentAssistParser {
}
} while (true);
after(grammarAccess.getWMLMacroAccess().getTagcontentAssignment_2());
after(grammarAccess.getWMLMacroAccess().getValueAssignment_2());
}
@ -6689,9 +6689,9 @@ public class InternalWMLParser extends AbstractInternalContentAssistParser {
// $ANTLR end rule__WMLRoot__RmacrosAssignment_1
// $ANTLR start rule__WMLMacro__MacroNameAssignment_1
// ../org.wesnoth.wml.ui/src-gen/org/wesnoth/ui/contentassist/antlr/internal/InternalWML.g:2498:1: rule__WMLMacro__MacroNameAssignment_1 : ( RULE_ID ) ;
public final void rule__WMLMacro__MacroNameAssignment_1() throws RecognitionException {
// $ANTLR start rule__WMLMacro__NameAssignment_1
// ../org.wesnoth.wml.ui/src-gen/org/wesnoth/ui/contentassist/antlr/internal/InternalWML.g:2498:1: rule__WMLMacro__NameAssignment_1 : ( RULE_ID ) ;
public final void rule__WMLMacro__NameAssignment_1() throws RecognitionException {
int stackSize = keepStackSize();
@ -6702,9 +6702,9 @@ public class InternalWMLParser extends AbstractInternalContentAssistParser {
// ../org.wesnoth.wml.ui/src-gen/org/wesnoth/ui/contentassist/antlr/internal/InternalWML.g:2503:1: ( RULE_ID )
// ../org.wesnoth.wml.ui/src-gen/org/wesnoth/ui/contentassist/antlr/internal/InternalWML.g:2504:1: RULE_ID
{
before(grammarAccess.getWMLMacroAccess().getMacroNameIDTerminalRuleCall_1_0());
match(input,RULE_ID,FOLLOW_RULE_ID_in_rule__WMLMacro__MacroNameAssignment_15122);
after(grammarAccess.getWMLMacroAccess().getMacroNameIDTerminalRuleCall_1_0());
before(grammarAccess.getWMLMacroAccess().getNameIDTerminalRuleCall_1_0());
match(input,RULE_ID,FOLLOW_RULE_ID_in_rule__WMLMacro__NameAssignment_15122);
after(grammarAccess.getWMLMacroAccess().getNameIDTerminalRuleCall_1_0());
}
@ -6723,34 +6723,34 @@ public class InternalWMLParser extends AbstractInternalContentAssistParser {
}
return ;
}
// $ANTLR end rule__WMLMacro__MacroNameAssignment_1
// $ANTLR end rule__WMLMacro__NameAssignment_1
// $ANTLR start rule__WMLMacro__TagcontentAssignment_2
// ../org.wesnoth.wml.ui/src-gen/org/wesnoth/ui/contentassist/antlr/internal/InternalWML.g:2513:1: rule__WMLMacro__TagcontentAssignment_2 : ( ( rule__WMLMacro__TagcontentAlternatives_2_0 ) ) ;
public final void rule__WMLMacro__TagcontentAssignment_2() throws RecognitionException {
// $ANTLR start rule__WMLMacro__ValueAssignment_2
// ../org.wesnoth.wml.ui/src-gen/org/wesnoth/ui/contentassist/antlr/internal/InternalWML.g:2513:1: rule__WMLMacro__ValueAssignment_2 : ( ( rule__WMLMacro__ValueAlternatives_2_0 ) ) ;
public final void rule__WMLMacro__ValueAssignment_2() throws RecognitionException {
int stackSize = keepStackSize();
try {
// ../org.wesnoth.wml.ui/src-gen/org/wesnoth/ui/contentassist/antlr/internal/InternalWML.g:2517:1: ( ( ( rule__WMLMacro__TagcontentAlternatives_2_0 ) ) )
// ../org.wesnoth.wml.ui/src-gen/org/wesnoth/ui/contentassist/antlr/internal/InternalWML.g:2518:1: ( ( rule__WMLMacro__TagcontentAlternatives_2_0 ) )
// ../org.wesnoth.wml.ui/src-gen/org/wesnoth/ui/contentassist/antlr/internal/InternalWML.g:2517:1: ( ( ( rule__WMLMacro__ValueAlternatives_2_0 ) ) )
// ../org.wesnoth.wml.ui/src-gen/org/wesnoth/ui/contentassist/antlr/internal/InternalWML.g:2518:1: ( ( rule__WMLMacro__ValueAlternatives_2_0 ) )
{
// ../org.wesnoth.wml.ui/src-gen/org/wesnoth/ui/contentassist/antlr/internal/InternalWML.g:2518:1: ( ( rule__WMLMacro__TagcontentAlternatives_2_0 ) )
// ../org.wesnoth.wml.ui/src-gen/org/wesnoth/ui/contentassist/antlr/internal/InternalWML.g:2519:1: ( rule__WMLMacro__TagcontentAlternatives_2_0 )
// ../org.wesnoth.wml.ui/src-gen/org/wesnoth/ui/contentassist/antlr/internal/InternalWML.g:2518:1: ( ( rule__WMLMacro__ValueAlternatives_2_0 ) )
// ../org.wesnoth.wml.ui/src-gen/org/wesnoth/ui/contentassist/antlr/internal/InternalWML.g:2519:1: ( rule__WMLMacro__ValueAlternatives_2_0 )
{
before(grammarAccess.getWMLMacroAccess().getTagcontentAlternatives_2_0());
// ../org.wesnoth.wml.ui/src-gen/org/wesnoth/ui/contentassist/antlr/internal/InternalWML.g:2520:1: ( rule__WMLMacro__TagcontentAlternatives_2_0 )
// ../org.wesnoth.wml.ui/src-gen/org/wesnoth/ui/contentassist/antlr/internal/InternalWML.g:2520:2: rule__WMLMacro__TagcontentAlternatives_2_0
before(grammarAccess.getWMLMacroAccess().getValueAlternatives_2_0());
// ../org.wesnoth.wml.ui/src-gen/org/wesnoth/ui/contentassist/antlr/internal/InternalWML.g:2520:1: ( rule__WMLMacro__ValueAlternatives_2_0 )
// ../org.wesnoth.wml.ui/src-gen/org/wesnoth/ui/contentassist/antlr/internal/InternalWML.g:2520:2: rule__WMLMacro__ValueAlternatives_2_0
{
pushFollow(FOLLOW_rule__WMLMacro__TagcontentAlternatives_2_0_in_rule__WMLMacro__TagcontentAssignment_25153);
rule__WMLMacro__TagcontentAlternatives_2_0();
pushFollow(FOLLOW_rule__WMLMacro__ValueAlternatives_2_0_in_rule__WMLMacro__ValueAssignment_25153);
rule__WMLMacro__ValueAlternatives_2_0();
_fsp--;
}
after(grammarAccess.getWMLMacroAccess().getTagcontentAlternatives_2_0());
after(grammarAccess.getWMLMacroAccess().getValueAlternatives_2_0());
}
@ -6769,7 +6769,7 @@ public class InternalWMLParser extends AbstractInternalContentAssistParser {
}
return ;
}
// $ANTLR end rule__WMLMacro__TagcontentAssignment_2
// $ANTLR end rule__WMLMacro__ValueAssignment_2
// $ANTLR start rule__WMLTag__NameAssignment_1
@ -7335,16 +7335,16 @@ public class InternalWMLParser extends AbstractInternalContentAssistParser {
public static final BitSet FOLLOW_rule__PROGRESSIVE__Group__0_in_rulePROGRESSIVE781 = new BitSet(new long[]{0x0000000000000002L});
public static final BitSet FOLLOW_rule__WMLRoot__RtagsAssignment_0_in_rule__WMLRoot__Alternatives817 = new BitSet(new long[]{0x0000000000000002L});
public static final BitSet FOLLOW_rule__WMLRoot__RmacrosAssignment_1_in_rule__WMLRoot__Alternatives835 = new BitSet(new long[]{0x0000000000000002L});
public static final BitSet FOLLOW_RULE_ID_in_rule__WMLMacro__TagcontentAlternatives_2_0868 = new BitSet(new long[]{0x0000000000000002L});
public static final BitSet FOLLOW_RULE_STRING_in_rule__WMLMacro__TagcontentAlternatives_2_0885 = new BitSet(new long[]{0x0000000000000002L});
public static final BitSet FOLLOW_9_in_rule__WMLMacro__TagcontentAlternatives_2_0903 = new BitSet(new long[]{0x0000000000000002L});
public static final BitSet FOLLOW_10_in_rule__WMLMacro__TagcontentAlternatives_2_0923 = new BitSet(new long[]{0x0000000000000002L});
public static final BitSet FOLLOW_11_in_rule__WMLMacro__TagcontentAlternatives_2_0943 = new BitSet(new long[]{0x0000000000000002L});
public static final BitSet FOLLOW_12_in_rule__WMLMacro__TagcontentAlternatives_2_0963 = new BitSet(new long[]{0x0000000000000002L});
public static final BitSet FOLLOW_13_in_rule__WMLMacro__TagcontentAlternatives_2_0983 = new BitSet(new long[]{0x0000000000000002L});
public static final BitSet FOLLOW_14_in_rule__WMLMacro__TagcontentAlternatives_2_01003 = new BitSet(new long[]{0x0000000000000002L});
public static final BitSet FOLLOW_15_in_rule__WMLMacro__TagcontentAlternatives_2_01023 = new BitSet(new long[]{0x0000000000000002L});
public static final BitSet FOLLOW_16_in_rule__WMLMacro__TagcontentAlternatives_2_01043 = new BitSet(new long[]{0x0000000000000002L});
public static final BitSet FOLLOW_RULE_ID_in_rule__WMLMacro__ValueAlternatives_2_0868 = new BitSet(new long[]{0x0000000000000002L});
public static final BitSet FOLLOW_RULE_STRING_in_rule__WMLMacro__ValueAlternatives_2_0885 = new BitSet(new long[]{0x0000000000000002L});
public static final BitSet FOLLOW_9_in_rule__WMLMacro__ValueAlternatives_2_0903 = new BitSet(new long[]{0x0000000000000002L});
public static final BitSet FOLLOW_10_in_rule__WMLMacro__ValueAlternatives_2_0923 = new BitSet(new long[]{0x0000000000000002L});
public static final BitSet FOLLOW_11_in_rule__WMLMacro__ValueAlternatives_2_0943 = new BitSet(new long[]{0x0000000000000002L});
public static final BitSet FOLLOW_12_in_rule__WMLMacro__ValueAlternatives_2_0963 = new BitSet(new long[]{0x0000000000000002L});
public static final BitSet FOLLOW_13_in_rule__WMLMacro__ValueAlternatives_2_0983 = new BitSet(new long[]{0x0000000000000002L});
public static final BitSet FOLLOW_14_in_rule__WMLMacro__ValueAlternatives_2_01003 = new BitSet(new long[]{0x0000000000000002L});
public static final BitSet FOLLOW_15_in_rule__WMLMacro__ValueAlternatives_2_01023 = new BitSet(new long[]{0x0000000000000002L});
public static final BitSet FOLLOW_16_in_rule__WMLMacro__ValueAlternatives_2_01043 = new BitSet(new long[]{0x0000000000000002L});
public static final BitSet FOLLOW_rule__WMLTag__TtagsAssignment_3_0_in_rule__WMLTag__Alternatives_31077 = new BitSet(new long[]{0x0000000000000002L});
public static final BitSet FOLLOW_rule__WMLTag__TkeysAssignment_3_1_in_rule__WMLTag__Alternatives_31095 = new BitSet(new long[]{0x0000000000000002L});
public static final BitSet FOLLOW_rule__WMLTag__TmacrosAssignment_3_2_in_rule__WMLTag__Alternatives_31113 = new BitSet(new long[]{0x0000000000000002L});
@ -7382,10 +7382,10 @@ public class InternalWMLParser extends AbstractInternalContentAssistParser {
public static final BitSet FOLLOW_25_in_rule__WMLMacro__Group__0__Impl1820 = new BitSet(new long[]{0x0000000000000002L});
public static final BitSet FOLLOW_rule__WMLMacro__Group__1__Impl_in_rule__WMLMacro__Group__11851 = new BitSet(new long[]{0x000000000401FE30L});
public static final BitSet FOLLOW_rule__WMLMacro__Group__2_in_rule__WMLMacro__Group__11854 = new BitSet(new long[]{0x0000000000000002L});
public static final BitSet FOLLOW_rule__WMLMacro__MacroNameAssignment_1_in_rule__WMLMacro__Group__1__Impl1881 = new BitSet(new long[]{0x0000000000000002L});
public static final BitSet FOLLOW_rule__WMLMacro__NameAssignment_1_in_rule__WMLMacro__Group__1__Impl1881 = new BitSet(new long[]{0x0000000000000002L});
public static final BitSet FOLLOW_rule__WMLMacro__Group__2__Impl_in_rule__WMLMacro__Group__21911 = new BitSet(new long[]{0x0000000004000000L});
public static final BitSet FOLLOW_rule__WMLMacro__Group__3_in_rule__WMLMacro__Group__21914 = new BitSet(new long[]{0x0000000000000002L});
public static final BitSet FOLLOW_rule__WMLMacro__TagcontentAssignment_2_in_rule__WMLMacro__Group__2__Impl1941 = new BitSet(new long[]{0x000000000001FE32L});
public static final BitSet FOLLOW_rule__WMLMacro__ValueAssignment_2_in_rule__WMLMacro__Group__2__Impl1941 = new BitSet(new long[]{0x000000000001FE32L});
public static final BitSet FOLLOW_rule__WMLMacro__Group__3__Impl_in_rule__WMLMacro__Group__31972 = new BitSet(new long[]{0x0000000000000002L});
public static final BitSet FOLLOW_26_in_rule__WMLMacro__Group__3__Impl2000 = new BitSet(new long[]{0x0000000000000002L});
public static final BitSet FOLLOW_rule__WMLTag__Group__0__Impl_in_rule__WMLTag__Group__02039 = new BitSet(new long[]{0x0000000000000010L});
@ -7520,8 +7520,8 @@ public class InternalWMLParser extends AbstractInternalContentAssistParser {
public static final BitSet FOLLOW_RULE_IINT_in_rule__PROGRESSIVE__Group_3_3__1__Impl5022 = new BitSet(new long[]{0x0000000000000002L});
public static final BitSet FOLLOW_ruleWMLTag_in_rule__WMLRoot__RtagsAssignment_05060 = new BitSet(new long[]{0x0000000000000002L});
public static final BitSet FOLLOW_ruleWMLMacro_in_rule__WMLRoot__RmacrosAssignment_15091 = new BitSet(new long[]{0x0000000000000002L});
public static final BitSet FOLLOW_RULE_ID_in_rule__WMLMacro__MacroNameAssignment_15122 = new BitSet(new long[]{0x0000000000000002L});
public static final BitSet FOLLOW_rule__WMLMacro__TagcontentAlternatives_2_0_in_rule__WMLMacro__TagcontentAssignment_25153 = new BitSet(new long[]{0x0000000000000002L});
public static final BitSet FOLLOW_RULE_ID_in_rule__WMLMacro__NameAssignment_15122 = new BitSet(new long[]{0x0000000000000002L});
public static final BitSet FOLLOW_rule__WMLMacro__ValueAlternatives_2_0_in_rule__WMLMacro__ValueAssignment_25153 = new BitSet(new long[]{0x0000000000000002L});
public static final BitSet FOLLOW_RULE_ID_in_rule__WMLTag__NameAssignment_15186 = new BitSet(new long[]{0x0000000000000002L});
public static final BitSet FOLLOW_ruleWMLTag_in_rule__WMLTag__TtagsAssignment_3_05217 = new BitSet(new long[]{0x0000000000000002L});
public static final BitSet FOLLOW_ruleWMLKey_in_rule__WMLTag__TkeysAssignment_3_15248 = new BitSet(new long[]{0x0000000000000002L});

4
utils/java/org.wesnoth.wml.ui/src/org/wesnoth/ui/syntax/WMLAntlrTokenToAttributeIdMapper.java
View file

@ -15,6 +15,10 @@ public class WMLAntlrTokenToAttributeIdMapper extends DefaultAntlrTokenToAttribu
{
return WMLHighlightingConfiguration.RULE_WML_TAG;
}
if (tokenName.equals("'{'") || tokenName.equals("'}'"))
{
return WMLHighlightingConfiguration.RULE_WML_MACRO;
}
return super.calculateId(tokenName, tokenType);
}
}

10
utils/java/org.wesnoth.wml.ui/src/org/wesnoth/ui/syntax/WMLHighlightingConfiguration.java
View file

@ -14,6 +14,7 @@ public class WMLHighlightingConfiguration extends DefaultHighlightingConfigurati
{
public static final String RULE_WML_TAG = "wmlTag";
public static final String RULE_WML_KEY = "wmlKey";
public static final String RULE_WML_MACRO = "wmlMacro";
@Override
public void configure(IHighlightingConfigurationAcceptor acceptor)
@ -21,6 +22,15 @@ public class WMLHighlightingConfiguration extends DefaultHighlightingConfigurati
super.configure(acceptor);
acceptor.acceptDefaultHighlighting(RULE_WML_TAG, "WML Tag", tagTextStyle());
acceptor.acceptDefaultHighlighting(RULE_WML_KEY, "WML Key", keyTextStyle());
acceptor.acceptDefaultHighlighting(RULE_WML_MACRO, "WML Macro", macroTextStyle());
}
public TextStyle macroTextStyle()
{
TextStyle textStyle = defaultTextStyle().copy();
textStyle.setColor(new RGB(197, 137, 23));
textStyle.setStyle(SWT.ITALIC);
return textStyle;
}
public TextStyle tagTextStyle()

9
utils/java/org.wesnoth.wml.ui/src/org/wesnoth/ui/syntax/WMLSemanticHighlightingCalculator.java
View file

@ -6,6 +6,7 @@ package org.wesnoth.ui.syntax;
import org.wesnoth.wML.WMLEndTag;
import org.wesnoth.wML.WMLKey;
import org.wesnoth.wML.WMLMacro;
import org.wesnoth.wML.WMLPackage;
import org.wesnoth.wML.WMLTag;
@ -49,6 +50,14 @@ public class WMLSemanticHighlightingCalculator extends SemanticHighlightingCalcu
AbstractNode begin = getFirstFeatureNode(current, WMLPackage.Literals.WML_KEY__KEY_NAME.getName());
highlightNode(begin, WMLHighlightingConfiguration.RULE_WML_KEY, acceptor);
}
else if (current instanceof WMLMacro)
{
AbstractNode begin = getFirstFeatureNode(current, WMLPackage.Literals.WML_MACRO__NAME.getName());
highlightNode(begin, WMLHighlightingConfiguration.RULE_WML_MACRO, acceptor);
AbstractNode end = getFirstFeatureNode(current, WMLPackage.Literals.WML_MACRO__VALUE.getName());
highlightNode(end, WMLHighlightingConfiguration.RULE_WML_MACRO, acceptor);
}
}
}

6
utils/java/org.wesnoth.wml/src-gen/org/wesnoth/WML.ecore
View file

@ -10,9 +10,9 @@
eType="#//WMLMacro" containment="true"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="WMLMacro">
<eStructuralFeatures xsi:type="ecore:EAttribute" name="macroName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="tagcontent" unique="false"
upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="value" unique="false" upperBound="-1"
eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="WMLTag">
<eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

4
utils/java/org.wesnoth.wml/src-gen/org/wesnoth/WML.genmodel
View file

@ -13,8 +13,8 @@
<genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference WML.ecore#//WMLRoot/Rmacros"/>
</genClasses>
<genClasses ecoreClass="WML.ecore#//WMLMacro">
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute WML.ecore#//WMLMacro/macroName"/>
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute WML.ecore#//WMLMacro/tagcontent"/>
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute WML.ecore#//WMLMacro/name"/>
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute WML.ecore#//WMLMacro/value"/>
</genClasses>
<genClasses ecoreClass="WML.ecore#//WMLTag">
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute WML.ecore#//WMLTag/name"/>

4
utils/java/org.wesnoth.wml/src-gen/org/wesnoth/WML.xmi
View file

@ -25,10 +25,10 @@
</type>
<alternatives xsi:type="xtext:Group">
<elements xsi:type="xtext:Keyword" value="{"/>
<elements xsi:type="xtext:Assignment" feature="macroName" operator="=">
<elements xsi:type="xtext:Assignment" feature="name" operator="=">
<terminal xsi:type="xtext:RuleCall" rule="//@rules.14"/>
</elements>
<elements xsi:type="xtext:Assignment" cardinality="*" feature="tagcontent" operator="+=">
<elements xsi:type="xtext:Assignment" cardinality="*" feature="value" operator="+=">
<terminal xsi:type="xtext:Alternatives">
<elements xsi:type="xtext:RuleCall" rule="//@rules.14"/>
<elements xsi:type="xtext:RuleCall" rule="//@rules.16"/>

80
utils/java/org.wesnoth.wml/src-gen/org/wesnoth/parseTreeConstruction/WMLParsetreeConstructor.java
View file

@ -172,11 +172,11 @@ protected class WMLRoot_RmacrosAssignment_1 extends AssignmentToken {
/************ begin Rule WMLMacro ****************
*
* WMLMacro:
* "{" macroName=ID tagcontent+=(ID | STRING | "_" | ":" | "-" | "." | "(" | ")" | "=" | "/")* "}";
* "{" name=ID value+=(ID | STRING | "_" | ":" | "-" | "." | "(" | ")" | "=" | "/")* "}";
*
**/
// "{" macroName=ID tagcontent+=(ID | STRING | "_" | ":" | "-" | "." | "(" | ")" | "=" | "/")* "}"
// "{" name=ID value+=(ID | STRING | "_" | ":" | "-" | "." | "(" | ")" | "=" | "/")* "}"
protected class WMLMacro_Group extends GroupToken {
public WMLMacro_Group(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
@ -226,16 +226,16 @@ protected class WMLMacro_LeftCurlyBracketKeyword_0 extends KeywordToken {
}
// macroName=ID
protected class WMLMacro_MacroNameAssignment_1 extends AssignmentToken {
// name=ID
protected class WMLMacro_NameAssignment_1 extends AssignmentToken {
public WMLMacro_MacroNameAssignment_1(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
public WMLMacro_NameAssignment_1(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
super(lastRuleCallOrigin, next, transitionIndex, eObjectConsumer);
}
@Override
public Assignment getGrammarElement() {
return grammarAccess.getWMLMacroAccess().getMacroNameAssignment_1();
return grammarAccess.getWMLMacroAccess().getNameAssignment_1();
}
@Override
@ -248,11 +248,11 @@ protected class WMLMacro_MacroNameAssignment_1 extends AssignmentToken {
@Override
public IEObjectConsumer tryConsume() {
if((value = eObjectConsumer.getConsumable("macroName",true)) == null) return null;
IEObjectConsumer obj = eObjectConsumer.cloneAndConsume("macroName");
if(valueSerializer.isValid(obj.getEObject(), grammarAccess.getWMLMacroAccess().getMacroNameIDTerminalRuleCall_1_0(), value, null)) {
if((value = eObjectConsumer.getConsumable("name",true)) == null) return null;
IEObjectConsumer obj = eObjectConsumer.cloneAndConsume("name");
if(valueSerializer.isValid(obj.getEObject(), grammarAccess.getWMLMacroAccess().getNameIDTerminalRuleCall_1_0(), value, null)) {
type = AssignmentType.TERMINAL_RULE_CALL;
element = grammarAccess.getWMLMacroAccess().getMacroNameIDTerminalRuleCall_1_0();
element = grammarAccess.getWMLMacroAccess().getNameIDTerminalRuleCall_1_0();
return obj;
}
return null;
@ -260,79 +260,79 @@ protected class WMLMacro_MacroNameAssignment_1 extends AssignmentToken {
}
// tagcontent+=(ID | STRING | "_" | ":" | "-" | "." | "(" | ")" | "=" | "/")*
protected class WMLMacro_TagcontentAssignment_2 extends AssignmentToken {
// value+=(ID | STRING | "_" | ":" | "-" | "." | "(" | ")" | "=" | "/")*
protected class WMLMacro_ValueAssignment_2 extends AssignmentToken {
public WMLMacro_TagcontentAssignment_2(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
public WMLMacro_ValueAssignment_2(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
super(lastRuleCallOrigin, next, transitionIndex, eObjectConsumer);
}
@Override
public Assignment getGrammarElement() {
return grammarAccess.getWMLMacroAccess().getTagcontentAssignment_2();
return grammarAccess.getWMLMacroAccess().getValueAssignment_2();
}
@Override
public AbstractToken createFollower(int index, IEObjectConsumer inst) {
switch(index) {
case 0: return new WMLMacro_TagcontentAssignment_2(lastRuleCallOrigin, this, 0, inst);
case 1: return new WMLMacro_MacroNameAssignment_1(lastRuleCallOrigin, this, 1, inst);
case 0: return new WMLMacro_ValueAssignment_2(lastRuleCallOrigin, this, 0, inst);
case 1: return new WMLMacro_NameAssignment_1(lastRuleCallOrigin, this, 1, inst);
default: return null;
}
}
@Override
public IEObjectConsumer tryConsume() {
if((value = eObjectConsumer.getConsumable("tagcontent",false)) == null) return null;
IEObjectConsumer obj = eObjectConsumer.cloneAndConsume("tagcontent");
if(keywordSerializer.isValid(obj.getEObject(), grammarAccess.getWMLMacroAccess().getTagcontent_Keyword_2_0_2(), value, null)) {
if((value = eObjectConsumer.getConsumable("value",false)) == null) return null;
IEObjectConsumer obj = eObjectConsumer.cloneAndConsume("value");
if(keywordSerializer.isValid(obj.getEObject(), grammarAccess.getWMLMacroAccess().getValue_Keyword_2_0_2(), value, null)) {
type = AssignmentType.KEYWORD;
element = grammarAccess.getWMLMacroAccess().getTagcontent_Keyword_2_0_2();
element = grammarAccess.getWMLMacroAccess().getValue_Keyword_2_0_2();
return obj;
}
if(keywordSerializer.isValid(obj.getEObject(), grammarAccess.getWMLMacroAccess().getTagcontentColonKeyword_2_0_3(), value, null)) {
if(keywordSerializer.isValid(obj.getEObject(), grammarAccess.getWMLMacroAccess().getValueColonKeyword_2_0_3(), value, null)) {
type = AssignmentType.KEYWORD;
element = grammarAccess.getWMLMacroAccess().getTagcontentColonKeyword_2_0_3();
element = grammarAccess.getWMLMacroAccess().getValueColonKeyword_2_0_3();
return obj;
}
if(keywordSerializer.isValid(obj.getEObject(), grammarAccess.getWMLMacroAccess().getTagcontentHyphenMinusKeyword_2_0_4(), value, null)) {
if(keywordSerializer.isValid(obj.getEObject(), grammarAccess.getWMLMacroAccess().getValueHyphenMinusKeyword_2_0_4(), value, null)) {
type = AssignmentType.KEYWORD;
element = grammarAccess.getWMLMacroAccess().getTagcontentHyphenMinusKeyword_2_0_4();
element = grammarAccess.getWMLMacroAccess().getValueHyphenMinusKeyword_2_0_4();
return obj;
}
if(keywordSerializer.isValid(obj.getEObject(), grammarAccess.getWMLMacroAccess().getTagcontentFullStopKeyword_2_0_5(), value, null)) {
if(keywordSerializer.isValid(obj.getEObject(), grammarAccess.getWMLMacroAccess().getValueFullStopKeyword_2_0_5(), value, null)) {
type = AssignmentType.KEYWORD;
element = grammarAccess.getWMLMacroAccess().getTagcontentFullStopKeyword_2_0_5();
element = grammarAccess.getWMLMacroAccess().getValueFullStopKeyword_2_0_5();
return obj;
}
if(keywordSerializer.isValid(obj.getEObject(), grammarAccess.getWMLMacroAccess().getTagcontentLeftParenthesisKeyword_2_0_6(), value, null)) {
if(keywordSerializer.isValid(obj.getEObject(), grammarAccess.getWMLMacroAccess().getValueLeftParenthesisKeyword_2_0_6(), value, null)) {
type = AssignmentType.KEYWORD;
element = grammarAccess.getWMLMacroAccess().getTagcontentLeftParenthesisKeyword_2_0_6();
element = grammarAccess.getWMLMacroAccess().getValueLeftParenthesisKeyword_2_0_6();
return obj;
}
if(keywordSerializer.isValid(obj.getEObject(), grammarAccess.getWMLMacroAccess().getTagcontentRightParenthesisKeyword_2_0_7(), value, null)) {
if(keywordSerializer.isValid(obj.getEObject(), grammarAccess.getWMLMacroAccess().getValueRightParenthesisKeyword_2_0_7(), value, null)) {
type = AssignmentType.KEYWORD;
element = grammarAccess.getWMLMacroAccess().getTagcontentRightParenthesisKeyword_2_0_7();
element = grammarAccess.getWMLMacroAccess().getValueRightParenthesisKeyword_2_0_7();
return obj;
}
if(keywordSerializer.isValid(obj.getEObject(), grammarAccess.getWMLMacroAccess().getTagcontentEqualsSignKeyword_2_0_8(), value, null)) {
if(keywordSerializer.isValid(obj.getEObject(), grammarAccess.getWMLMacroAccess().getValueEqualsSignKeyword_2_0_8(), value, null)) {
type = AssignmentType.KEYWORD;
element = grammarAccess.getWMLMacroAccess().getTagcontentEqualsSignKeyword_2_0_8();
element = grammarAccess.getWMLMacroAccess().getValueEqualsSignKeyword_2_0_8();
return obj;
}
if(keywordSerializer.isValid(obj.getEObject(), grammarAccess.getWMLMacroAccess().getTagcontentSolidusKeyword_2_0_9(), value, null)) {
if(keywordSerializer.isValid(obj.getEObject(), grammarAccess.getWMLMacroAccess().getValueSolidusKeyword_2_0_9(), value, null)) {
type = AssignmentType.KEYWORD;
element = grammarAccess.getWMLMacroAccess().getTagcontentSolidusKeyword_2_0_9();
element = grammarAccess.getWMLMacroAccess().getValueSolidusKeyword_2_0_9();
return obj;
}
if(valueSerializer.isValid(obj.getEObject(), grammarAccess.getWMLMacroAccess().getTagcontentIDTerminalRuleCall_2_0_0(), value, null)) {
if(valueSerializer.isValid(obj.getEObject(), grammarAccess.getWMLMacroAccess().getValueIDTerminalRuleCall_2_0_0(), value, null)) {
type = AssignmentType.TERMINAL_RULE_CALL;
element = grammarAccess.getWMLMacroAccess().getTagcontentIDTerminalRuleCall_2_0_0();
element = grammarAccess.getWMLMacroAccess().getValueIDTerminalRuleCall_2_0_0();
return obj;
}
if(valueSerializer.isValid(obj.getEObject(), grammarAccess.getWMLMacroAccess().getTagcontentSTRINGTerminalRuleCall_2_0_1(), value, null)) {
if(valueSerializer.isValid(obj.getEObject(), grammarAccess.getWMLMacroAccess().getValueSTRINGTerminalRuleCall_2_0_1(), value, null)) {
type = AssignmentType.TERMINAL_RULE_CALL;
element = grammarAccess.getWMLMacroAccess().getTagcontentSTRINGTerminalRuleCall_2_0_1();
element = grammarAccess.getWMLMacroAccess().getValueSTRINGTerminalRuleCall_2_0_1();
return obj;
}
return null;
@ -355,8 +355,8 @@ protected class WMLMacro_RightCurlyBracketKeyword_3 extends KeywordToken {
@Override
public AbstractToken createFollower(int index, IEObjectConsumer inst) {
switch(index) {
case 0: return new WMLMacro_TagcontentAssignment_2(lastRuleCallOrigin, this, 0, inst);
case 1: return new WMLMacro_MacroNameAssignment_1(lastRuleCallOrigin, this, 1, inst);
case 0: return new WMLMacro_ValueAssignment_2(lastRuleCallOrigin, this, 0, inst);
case 1: return new WMLMacro_NameAssignment_1(lastRuleCallOrigin, this, 1, inst);
default: return null;
}
}

72
utils/java/org.wesnoth.wml/src-gen/org/wesnoth/parser/antlr/internal/InternalWML.g
View file

@ -167,9 +167,9 @@ ruleWMLMacro returns [EObject current=null]
}
(
(
lv_macroName_1_0=RULE_ID
lv_name_1_0=RULE_ID
{
createLeafNode(grammarAccess.getWMLMacroAccess().getMacroNameIDTerminalRuleCall_1_0(), "macroName");
createLeafNode(grammarAccess.getWMLMacroAccess().getNameIDTerminalRuleCall_1_0(), "name");
}
{
if ($current==null) {
@ -179,8 +179,8 @@ ruleWMLMacro returns [EObject current=null]
try {
set(
$current,
"macroName",
lv_macroName_1_0,
"name",
lv_name_1_0,
"ID",
lastConsumedNode);
} catch (ValueConverterException vce) {
@ -192,9 +192,9 @@ ruleWMLMacro returns [EObject current=null]
)(
(
(
lv_tagcontent_2_1=RULE_ID
lv_value_2_1=RULE_ID
{
createLeafNode(grammarAccess.getWMLMacroAccess().getTagcontentIDTerminalRuleCall_2_0_0(), "tagcontent");
createLeafNode(grammarAccess.getWMLMacroAccess().getValueIDTerminalRuleCall_2_0_0(), "value");
}
{
if ($current==null) {
@ -204,8 +204,8 @@ ruleWMLMacro returns [EObject current=null]
try {
add(
$current,
"tagcontent",
lv_tagcontent_2_1,
"value",
lv_value_2_1,
"ID",
lastConsumedNode);
} catch (ValueConverterException vce) {
@ -213,9 +213,9 @@ ruleWMLMacro returns [EObject current=null]
}
}
| lv_tagcontent_2_2=RULE_STRING
| lv_value_2_2=RULE_STRING
{
createLeafNode(grammarAccess.getWMLMacroAccess().getTagcontentSTRINGTerminalRuleCall_2_0_1(), "tagcontent");
createLeafNode(grammarAccess.getWMLMacroAccess().getValueSTRINGTerminalRuleCall_2_0_1(), "value");
}
{
if ($current==null) {
@ -225,8 +225,8 @@ ruleWMLMacro returns [EObject current=null]
try {
add(
$current,
"tagcontent",
lv_tagcontent_2_2,
"value",
lv_value_2_2,
"STRING",
lastConsumedNode);
} catch (ValueConverterException vce) {
@ -234,9 +234,9 @@ ruleWMLMacro returns [EObject current=null]
}
}
| lv_tagcontent_2_3= '_'
| lv_value_2_3= '_'
{
createLeafNode(grammarAccess.getWMLMacroAccess().getTagcontent_Keyword_2_0_2(), "tagcontent");
createLeafNode(grammarAccess.getWMLMacroAccess().getValue_Keyword_2_0_2(), "value");
}
{
@ -246,15 +246,15 @@ ruleWMLMacro returns [EObject current=null]
}
try {
add($current, "tagcontent", lv_tagcontent_2_3, null, lastConsumedNode);
add($current, "value", lv_value_2_3, null, lastConsumedNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
}
| lv_tagcontent_2_4= ':'
| lv_value_2_4= ':'
{
createLeafNode(grammarAccess.getWMLMacroAccess().getTagcontentColonKeyword_2_0_3(), "tagcontent");
createLeafNode(grammarAccess.getWMLMacroAccess().getValueColonKeyword_2_0_3(), "value");
}
{
@ -264,15 +264,15 @@ ruleWMLMacro returns [EObject current=null]
}
try {
add($current, "tagcontent", lv_tagcontent_2_4, null, lastConsumedNode);
add($current, "value", lv_value_2_4, null, lastConsumedNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
}
| lv_tagcontent_2_5= '-'
| lv_value_2_5= '-'
{
createLeafNode(grammarAccess.getWMLMacroAccess().getTagcontentHyphenMinusKeyword_2_0_4(), "tagcontent");
createLeafNode(grammarAccess.getWMLMacroAccess().getValueHyphenMinusKeyword_2_0_4(), "value");
}
{
@ -282,15 +282,15 @@ ruleWMLMacro returns [EObject current=null]
}
try {
add($current, "tagcontent", lv_tagcontent_2_5, null, lastConsumedNode);
add($current, "value", lv_value_2_5, null, lastConsumedNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
}
| lv_tagcontent_2_6= '.'
| lv_value_2_6= '.'
{
createLeafNode(grammarAccess.getWMLMacroAccess().getTagcontentFullStopKeyword_2_0_5(), "tagcontent");
createLeafNode(grammarAccess.getWMLMacroAccess().getValueFullStopKeyword_2_0_5(), "value");
}
{
@ -300,15 +300,15 @@ ruleWMLMacro returns [EObject current=null]
}
try {
add($current, "tagcontent", lv_tagcontent_2_6, null, lastConsumedNode);
add($current, "value", lv_value_2_6, null, lastConsumedNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
}
| lv_tagcontent_2_7= '('
| lv_value_2_7= '('
{
createLeafNode(grammarAccess.getWMLMacroAccess().getTagcontentLeftParenthesisKeyword_2_0_6(), "tagcontent");
createLeafNode(grammarAccess.getWMLMacroAccess().getValueLeftParenthesisKeyword_2_0_6(), "value");
}
{
@ -318,15 +318,15 @@ ruleWMLMacro returns [EObject current=null]
}
try {
add($current, "tagcontent", lv_tagcontent_2_7, null, lastConsumedNode);
add($current, "value", lv_value_2_7, null, lastConsumedNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
}
| lv_tagcontent_2_8= ')'
| lv_value_2_8= ')'
{
createLeafNode(grammarAccess.getWMLMacroAccess().getTagcontentRightParenthesisKeyword_2_0_7(), "tagcontent");
createLeafNode(grammarAccess.getWMLMacroAccess().getValueRightParenthesisKeyword_2_0_7(), "value");
}
{
@ -336,15 +336,15 @@ ruleWMLMacro returns [EObject current=null]
}
try {
add($current, "tagcontent", lv_tagcontent_2_8, null, lastConsumedNode);
add($current, "value", lv_value_2_8, null, lastConsumedNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
}
| lv_tagcontent_2_9= '='
| lv_value_2_9= '='
{
createLeafNode(grammarAccess.getWMLMacroAccess().getTagcontentEqualsSignKeyword_2_0_8(), "tagcontent");
createLeafNode(grammarAccess.getWMLMacroAccess().getValueEqualsSignKeyword_2_0_8(), "value");
}
{
@ -354,15 +354,15 @@ ruleWMLMacro returns [EObject current=null]
}
try {
add($current, "tagcontent", lv_tagcontent_2_9, null, lastConsumedNode);
add($current, "value", lv_value_2_9, null, lastConsumedNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
}
| lv_tagcontent_2_10= '/'
| lv_value_2_10= '/'
{
createLeafNode(grammarAccess.getWMLMacroAccess().getTagcontentSolidusKeyword_2_0_9(), "tagcontent");
createLeafNode(grammarAccess.getWMLMacroAccess().getValueSolidusKeyword_2_0_9(), "value");
}
{
@ -372,7 +372,7 @@ ruleWMLMacro returns [EObject current=null]
}
try {
add($current, "tagcontent", lv_tagcontent_2_10, null, lastConsumedNode);
add($current, "value", lv_value_2_10, null, lastConsumedNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}

144
utils/java/org.wesnoth.wml/src-gen/org/wesnoth/parser/antlr/internal/InternalWMLParser.java
View file

@ -281,45 +281,45 @@ public class InternalWMLParser extends AbstractInternalAntlrParser {
// $ANTLR start ruleWMLMacro
// ../org.wesnoth.wml/src-gen/org/wesnoth/parser/antlr/internal/InternalWML.g:158:1: ruleWMLMacro returns [EObject current=null] : ( '{' ( (lv_macroName_1_0= RULE_ID ) ) ( ( (lv_tagcontent_2_1= RULE_ID | lv_tagcontent_2_2= RULE_STRING | lv_tagcontent_2_3= '_' | lv_tagcontent_2_4= ':' | lv_tagcontent_2_5= '-' | lv_tagcontent_2_6= '.' | lv_tagcontent_2_7= '(' | lv_tagcontent_2_8= ')' | lv_tagcontent_2_9= '=' | lv_tagcontent_2_10= '/' ) ) )* '}' ) ;
// ../org.wesnoth.wml/src-gen/org/wesnoth/parser/antlr/internal/InternalWML.g:158:1: ruleWMLMacro returns [EObject current=null] : ( '{' ( (lv_name_1_0= RULE_ID ) ) ( ( (lv_value_2_1= RULE_ID | lv_value_2_2= RULE_STRING | lv_value_2_3= '_' | lv_value_2_4= ':' | lv_value_2_5= '-' | lv_value_2_6= '.' | lv_value_2_7= '(' | lv_value_2_8= ')' | lv_value_2_9= '=' | lv_value_2_10= '/' ) ) )* '}' ) ;
public final EObject ruleWMLMacro() throws RecognitionException {
EObject current = null;
Token lv_macroName_1_0=null;
Token lv_tagcontent_2_1=null;
Token lv_tagcontent_2_2=null;
Token lv_tagcontent_2_3=null;
Token lv_tagcontent_2_4=null;
Token lv_tagcontent_2_5=null;
Token lv_tagcontent_2_6=null;
Token lv_tagcontent_2_7=null;
Token lv_tagcontent_2_8=null;
Token lv_tagcontent_2_9=null;
Token lv_tagcontent_2_10=null;
Token lv_name_1_0=null;
Token lv_value_2_1=null;
Token lv_value_2_2=null;
Token lv_value_2_3=null;
Token lv_value_2_4=null;
Token lv_value_2_5=null;
Token lv_value_2_6=null;
Token lv_value_2_7=null;
Token lv_value_2_8=null;
Token lv_value_2_9=null;
Token lv_value_2_10=null;
EObject temp=null; setCurrentLookahead(); resetLookahead();
try {
// ../org.wesnoth.wml/src-gen/org/wesnoth/parser/antlr/internal/InternalWML.g:163:6: ( ( '{' ( (lv_macroName_1_0= RULE_ID ) ) ( ( (lv_tagcontent_2_1= RULE_ID | lv_tagcontent_2_2= RULE_STRING | lv_tagcontent_2_3= '_' | lv_tagcontent_2_4= ':' | lv_tagcontent_2_5= '-' | lv_tagcontent_2_6= '.' | lv_tagcontent_2_7= '(' | lv_tagcontent_2_8= ')' | lv_tagcontent_2_9= '=' | lv_tagcontent_2_10= '/' ) ) )* '}' ) )
// ../org.wesnoth.wml/src-gen/org/wesnoth/parser/antlr/internal/InternalWML.g:164:1: ( '{' ( (lv_macroName_1_0= RULE_ID ) ) ( ( (lv_tagcontent_2_1= RULE_ID | lv_tagcontent_2_2= RULE_STRING | lv_tagcontent_2_3= '_' | lv_tagcontent_2_4= ':' | lv_tagcontent_2_5= '-' | lv_tagcontent_2_6= '.' | lv_tagcontent_2_7= '(' | lv_tagcontent_2_8= ')' | lv_tagcontent_2_9= '=' | lv_tagcontent_2_10= '/' ) ) )* '}' )
// ../org.wesnoth.wml/src-gen/org/wesnoth/parser/antlr/internal/InternalWML.g:163:6: ( ( '{' ( (lv_name_1_0= RULE_ID ) ) ( ( (lv_value_2_1= RULE_ID | lv_value_2_2= RULE_STRING | lv_value_2_3= '_' | lv_value_2_4= ':' | lv_value_2_5= '-' | lv_value_2_6= '.' | lv_value_2_7= '(' | lv_value_2_8= ')' | lv_value_2_9= '=' | lv_value_2_10= '/' ) ) )* '}' ) )
// ../org.wesnoth.wml/src-gen/org/wesnoth/parser/antlr/internal/InternalWML.g:164:1: ( '{' ( (lv_name_1_0= RULE_ID ) ) ( ( (lv_value_2_1= RULE_ID | lv_value_2_2= RULE_STRING | lv_value_2_3= '_' | lv_value_2_4= ':' | lv_value_2_5= '-' | lv_value_2_6= '.' | lv_value_2_7= '(' | lv_value_2_8= ')' | lv_value_2_9= '=' | lv_value_2_10= '/' ) ) )* '}' )
{
// ../org.wesnoth.wml/src-gen/org/wesnoth/parser/antlr/internal/InternalWML.g:164:1: ( '{' ( (lv_macroName_1_0= RULE_ID ) ) ( ( (lv_tagcontent_2_1= RULE_ID | lv_tagcontent_2_2= RULE_STRING | lv_tagcontent_2_3= '_' | lv_tagcontent_2_4= ':' | lv_tagcontent_2_5= '-' | lv_tagcontent_2_6= '.' | lv_tagcontent_2_7= '(' | lv_tagcontent_2_8= ')' | lv_tagcontent_2_9= '=' | lv_tagcontent_2_10= '/' ) ) )* '}' )
// ../org.wesnoth.wml/src-gen/org/wesnoth/parser/antlr/internal/InternalWML.g:164:3: '{' ( (lv_macroName_1_0= RULE_ID ) ) ( ( (lv_tagcontent_2_1= RULE_ID | lv_tagcontent_2_2= RULE_STRING | lv_tagcontent_2_3= '_' | lv_tagcontent_2_4= ':' | lv_tagcontent_2_5= '-' | lv_tagcontent_2_6= '.' | lv_tagcontent_2_7= '(' | lv_tagcontent_2_8= ')' | lv_tagcontent_2_9= '=' | lv_tagcontent_2_10= '/' ) ) )* '}'
// ../org.wesnoth.wml/src-gen/org/wesnoth/parser/antlr/internal/InternalWML.g:164:1: ( '{' ( (lv_name_1_0= RULE_ID ) ) ( ( (lv_value_2_1= RULE_ID | lv_value_2_2= RULE_STRING | lv_value_2_3= '_' | lv_value_2_4= ':' | lv_value_2_5= '-' | lv_value_2_6= '.' | lv_value_2_7= '(' | lv_value_2_8= ')' | lv_value_2_9= '=' | lv_value_2_10= '/' ) ) )* '}' )
// ../org.wesnoth.wml/src-gen/org/wesnoth/parser/antlr/internal/InternalWML.g:164:3: '{' ( (lv_name_1_0= RULE_ID ) ) ( ( (lv_value_2_1= RULE_ID | lv_value_2_2= RULE_STRING | lv_value_2_3= '_' | lv_value_2_4= ':' | lv_value_2_5= '-' | lv_value_2_6= '.' | lv_value_2_7= '(' | lv_value_2_8= ')' | lv_value_2_9= '=' | lv_value_2_10= '/' ) ) )* '}'
{
match(input,9,FOLLOW_9_in_ruleWMLMacro240);
createLeafNode(grammarAccess.getWMLMacroAccess().getLeftCurlyBracketKeyword_0(), null);
// ../org.wesnoth.wml/src-gen/org/wesnoth/parser/antlr/internal/InternalWML.g:168:1: ( (lv_macroName_1_0= RULE_ID ) )
// ../org.wesnoth.wml/src-gen/org/wesnoth/parser/antlr/internal/InternalWML.g:169:1: (lv_macroName_1_0= RULE_ID )
// ../org.wesnoth.wml/src-gen/org/wesnoth/parser/antlr/internal/InternalWML.g:168:1: ( (lv_name_1_0= RULE_ID ) )
// ../org.wesnoth.wml/src-gen/org/wesnoth/parser/antlr/internal/InternalWML.g:169:1: (lv_name_1_0= RULE_ID )
{
// ../org.wesnoth.wml/src-gen/org/wesnoth/parser/antlr/internal/InternalWML.g:169:1: (lv_macroName_1_0= RULE_ID )
// ../org.wesnoth.wml/src-gen/org/wesnoth/parser/antlr/internal/InternalWML.g:170:3: lv_macroName_1_0= RULE_ID
// ../org.wesnoth.wml/src-gen/org/wesnoth/parser/antlr/internal/InternalWML.g:169:1: (lv_name_1_0= RULE_ID )
// ../org.wesnoth.wml/src-gen/org/wesnoth/parser/antlr/internal/InternalWML.g:170:3: lv_name_1_0= RULE_ID
{
lv_macroName_1_0=(Token)input.LT(1);
lv_name_1_0=(Token)input.LT(1);
match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleWMLMacro257);
createLeafNode(grammarAccess.getWMLMacroAccess().getMacroNameIDTerminalRuleCall_1_0(), "macroName");
createLeafNode(grammarAccess.getWMLMacroAccess().getNameIDTerminalRuleCall_1_0(), "name");
if (current==null) {
@ -329,8 +329,8 @@ public class InternalWMLParser extends AbstractInternalAntlrParser {
try {
set(
current,
"macroName",
lv_macroName_1_0,
"name",
lv_name_1_0,
"ID",
lastConsumedNode);
} catch (ValueConverterException vce) {
@ -343,7 +343,7 @@ public class InternalWMLParser extends AbstractInternalAntlrParser {
}
// ../org.wesnoth.wml/src-gen/org/wesnoth/parser/antlr/internal/InternalWML.g:192:2: ( ( (lv_tagcontent_2_1= RULE_ID | lv_tagcontent_2_2= RULE_STRING | lv_tagcontent_2_3= '_' | lv_tagcontent_2_4= ':' | lv_tagcontent_2_5= '-' | lv_tagcontent_2_6= '.' | lv_tagcontent_2_7= '(' | lv_tagcontent_2_8= ')' | lv_tagcontent_2_9= '=' | lv_tagcontent_2_10= '/' ) ) )*
// ../org.wesnoth.wml/src-gen/org/wesnoth/parser/antlr/internal/InternalWML.g:192:2: ( ( (lv_value_2_1= RULE_ID | lv_value_2_2= RULE_STRING | lv_value_2_3= '_' | lv_value_2_4= ':' | lv_value_2_5= '-' | lv_value_2_6= '.' | lv_value_2_7= '(' | lv_value_2_8= ')' | lv_value_2_9= '=' | lv_value_2_10= '/' ) ) )*
loop3:
do {
int alt3=2;
@ -356,12 +356,12 @@ public class InternalWMLParser extends AbstractInternalAntlrParser {
switch (alt3) {
case 1 :
// ../org.wesnoth.wml/src-gen/org/wesnoth/parser/antlr/internal/InternalWML.g:193:1: ( (lv_tagcontent_2_1= RULE_ID | lv_tagcontent_2_2= RULE_STRING | lv_tagcontent_2_3= '_' | lv_tagcontent_2_4= ':' | lv_tagcontent_2_5= '-' | lv_tagcontent_2_6= '.' | lv_tagcontent_2_7= '(' | lv_tagcontent_2_8= ')' | lv_tagcontent_2_9= '=' | lv_tagcontent_2_10= '/' ) )
// ../org.wesnoth.wml/src-gen/org/wesnoth/parser/antlr/internal/InternalWML.g:193:1: ( (lv_value_2_1= RULE_ID | lv_value_2_2= RULE_STRING | lv_value_2_3= '_' | lv_value_2_4= ':' | lv_value_2_5= '-' | lv_value_2_6= '.' | lv_value_2_7= '(' | lv_value_2_8= ')' | lv_value_2_9= '=' | lv_value_2_10= '/' ) )
{
// ../org.wesnoth.wml/src-gen/org/wesnoth/parser/antlr/internal/InternalWML.g:193:1: ( (lv_tagcontent_2_1= RULE_ID | lv_tagcontent_2_2= RULE_STRING | lv_tagcontent_2_3= '_' | lv_tagcontent_2_4= ':' | lv_tagcontent_2_5= '-' | lv_tagcontent_2_6= '.' | lv_tagcontent_2_7= '(' | lv_tagcontent_2_8= ')' | lv_tagcontent_2_9= '=' | lv_tagcontent_2_10= '/' ) )
// ../org.wesnoth.wml/src-gen/org/wesnoth/parser/antlr/internal/InternalWML.g:194:1: (lv_tagcontent_2_1= RULE_ID | lv_tagcontent_2_2= RULE_STRING | lv_tagcontent_2_3= '_' | lv_tagcontent_2_4= ':' | lv_tagcontent_2_5= '-' | lv_tagcontent_2_6= '.' | lv_tagcontent_2_7= '(' | lv_tagcontent_2_8= ')' | lv_tagcontent_2_9= '=' | lv_tagcontent_2_10= '/' )
// ../org.wesnoth.wml/src-gen/org/wesnoth/parser/antlr/internal/InternalWML.g:193:1: ( (lv_value_2_1= RULE_ID | lv_value_2_2= RULE_STRING | lv_value_2_3= '_' | lv_value_2_4= ':' | lv_value_2_5= '-' | lv_value_2_6= '.' | lv_value_2_7= '(' | lv_value_2_8= ')' | lv_value_2_9= '=' | lv_value_2_10= '/' ) )
// ../org.wesnoth.wml/src-gen/org/wesnoth/parser/antlr/internal/InternalWML.g:194:1: (lv_value_2_1= RULE_ID | lv_value_2_2= RULE_STRING | lv_value_2_3= '_' | lv_value_2_4= ':' | lv_value_2_5= '-' | lv_value_2_6= '.' | lv_value_2_7= '(' | lv_value_2_8= ')' | lv_value_2_9= '=' | lv_value_2_10= '/' )
{
// ../org.wesnoth.wml/src-gen/org/wesnoth/parser/antlr/internal/InternalWML.g:194:1: (lv_tagcontent_2_1= RULE_ID | lv_tagcontent_2_2= RULE_STRING | lv_tagcontent_2_3= '_' | lv_tagcontent_2_4= ':' | lv_tagcontent_2_5= '-' | lv_tagcontent_2_6= '.' | lv_tagcontent_2_7= '(' | lv_tagcontent_2_8= ')' | lv_tagcontent_2_9= '=' | lv_tagcontent_2_10= '/' )
// ../org.wesnoth.wml/src-gen/org/wesnoth/parser/antlr/internal/InternalWML.g:194:1: (lv_value_2_1= RULE_ID | lv_value_2_2= RULE_STRING | lv_value_2_3= '_' | lv_value_2_4= ':' | lv_value_2_5= '-' | lv_value_2_6= '.' | lv_value_2_7= '(' | lv_value_2_8= ')' | lv_value_2_9= '=' | lv_value_2_10= '/' )
int alt2=10;
switch ( input.LA(1) ) {
case RULE_ID:
@ -416,19 +416,19 @@ public class InternalWMLParser extends AbstractInternalAntlrParser {
break;
default:
NoViableAltException nvae =
new NoViableAltException("194:1: (lv_tagcontent_2_1= RULE_ID | lv_tagcontent_2_2= RULE_STRING | lv_tagcontent_2_3= '_' | lv_tagcontent_2_4= ':' | lv_tagcontent_2_5= '-' | lv_tagcontent_2_6= '.' | lv_tagcontent_2_7= '(' | lv_tagcontent_2_8= ')' | lv_tagcontent_2_9= '=' | lv_tagcontent_2_10= '/' )", 2, 0, input);
new NoViableAltException("194:1: (lv_value_2_1= RULE_ID | lv_value_2_2= RULE_STRING | lv_value_2_3= '_' | lv_value_2_4= ':' | lv_value_2_5= '-' | lv_value_2_6= '.' | lv_value_2_7= '(' | lv_value_2_8= ')' | lv_value_2_9= '=' | lv_value_2_10= '/' )", 2, 0, input);
throw nvae;
}
switch (alt2) {
case 1 :
// ../org.wesnoth.wml/src-gen/org/wesnoth/parser/antlr/internal/InternalWML.g:195:3: lv_tagcontent_2_1= RULE_ID
// ../org.wesnoth.wml/src-gen/org/wesnoth/parser/antlr/internal/InternalWML.g:195:3: lv_value_2_1= RULE_ID
{
lv_tagcontent_2_1=(Token)input.LT(1);
lv_value_2_1=(Token)input.LT(1);
match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleWMLMacro281);
createLeafNode(grammarAccess.getWMLMacroAccess().getTagcontentIDTerminalRuleCall_2_0_0(), "tagcontent");
createLeafNode(grammarAccess.getWMLMacroAccess().getValueIDTerminalRuleCall_2_0_0(), "value");
if (current==null) {
@ -438,8 +438,8 @@ public class InternalWMLParser extends AbstractInternalAntlrParser {
try {
add(
current,
"tagcontent",
lv_tagcontent_2_1,
"value",
lv_value_2_1,
"ID",
lastConsumedNode);
} catch (ValueConverterException vce) {
@ -450,12 +450,12 @@ public class InternalWMLParser extends AbstractInternalAntlrParser {
}
break;
case 2 :
// ../org.wesnoth.wml/src-gen/org/wesnoth/parser/antlr/internal/InternalWML.g:216:8: lv_tagcontent_2_2= RULE_STRING
// ../org.wesnoth.wml/src-gen/org/wesnoth/parser/antlr/internal/InternalWML.g:216:8: lv_value_2_2= RULE_STRING
{
lv_tagcontent_2_2=(Token)input.LT(1);
lv_value_2_2=(Token)input.LT(1);
match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleWMLMacro301);
createLeafNode(grammarAccess.getWMLMacroAccess().getTagcontentSTRINGTerminalRuleCall_2_0_1(), "tagcontent");
createLeafNode(grammarAccess.getWMLMacroAccess().getValueSTRINGTerminalRuleCall_2_0_1(), "value");
if (current==null) {
@ -465,8 +465,8 @@ public class InternalWMLParser extends AbstractInternalAntlrParser {
try {
add(
current,
"tagcontent",
lv_tagcontent_2_2,
"value",
lv_value_2_2,
"STRING",
lastConsumedNode);
} catch (ValueConverterException vce) {
@ -477,12 +477,12 @@ public class InternalWMLParser extends AbstractInternalAntlrParser {
}
break;
case 3 :
// ../org.wesnoth.wml/src-gen/org/wesnoth/parser/antlr/internal/InternalWML.g:237:8: lv_tagcontent_2_3= '_'
// ../org.wesnoth.wml/src-gen/org/wesnoth/parser/antlr/internal/InternalWML.g:237:8: lv_value_2_3= '_'
{
lv_tagcontent_2_3=(Token)input.LT(1);
lv_value_2_3=(Token)input.LT(1);
match(input,10,FOLLOW_10_in_ruleWMLMacro322);
createLeafNode(grammarAccess.getWMLMacroAccess().getTagcontent_Keyword_2_0_2(), "tagcontent");
createLeafNode(grammarAccess.getWMLMacroAccess().getValue_Keyword_2_0_2(), "value");
if (current==null) {
@ -491,7 +491,7 @@ public class InternalWMLParser extends AbstractInternalAntlrParser {
}
try {
add(current, "tagcontent", lv_tagcontent_2_3, null, lastConsumedNode);
add(current, "value", lv_value_2_3, null, lastConsumedNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
@ -500,12 +500,12 @@ public class InternalWMLParser extends AbstractInternalAntlrParser {
}
break;
case 4 :
// ../org.wesnoth.wml/src-gen/org/wesnoth/parser/antlr/internal/InternalWML.g:255:8: lv_tagcontent_2_4= ':'
// ../org.wesnoth.wml/src-gen/org/wesnoth/parser/antlr/internal/InternalWML.g:255:8: lv_value_2_4= ':'
{
lv_tagcontent_2_4=(Token)input.LT(1);
lv_value_2_4=(Token)input.LT(1);
match(input,11,FOLLOW_11_in_ruleWMLMacro351);
createLeafNode(grammarAccess.getWMLMacroAccess().getTagcontentColonKeyword_2_0_3(), "tagcontent");
createLeafNode(grammarAccess.getWMLMacroAccess().getValueColonKeyword_2_0_3(), "value");
if (current==null) {
@ -514,7 +514,7 @@ public class InternalWMLParser extends AbstractInternalAntlrParser {
}
try {
add(current, "tagcontent", lv_tagcontent_2_4, null, lastConsumedNode);
add(current, "value", lv_value_2_4, null, lastConsumedNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
@ -523,12 +523,12 @@ public class InternalWMLParser extends AbstractInternalAntlrParser {
}
break;
case 5 :
// ../org.wesnoth.wml/src-gen/org/wesnoth/parser/antlr/internal/InternalWML.g:273:8: lv_tagcontent_2_5= '-'
// ../org.wesnoth.wml/src-gen/org/wesnoth/parser/antlr/internal/InternalWML.g:273:8: lv_value_2_5= '-'
{
lv_tagcontent_2_5=(Token)input.LT(1);
lv_value_2_5=(Token)input.LT(1);
match(input,12,FOLLOW_12_in_ruleWMLMacro380);
createLeafNode(grammarAccess.getWMLMacroAccess().getTagcontentHyphenMinusKeyword_2_0_4(), "tagcontent");
createLeafNode(grammarAccess.getWMLMacroAccess().getValueHyphenMinusKeyword_2_0_4(), "value");
if (current==null) {
@ -537,7 +537,7 @@ public class InternalWMLParser extends AbstractInternalAntlrParser {
}
try {
add(current, "tagcontent", lv_tagcontent_2_5, null, lastConsumedNode);
add(current, "value", lv_value_2_5, null, lastConsumedNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
@ -546,12 +546,12 @@ public class InternalWMLParser extends AbstractInternalAntlrParser {
}
break;
case 6 :
// ../org.wesnoth.wml/src-gen/org/wesnoth/parser/antlr/internal/InternalWML.g:291:8: lv_tagcontent_2_6= '.'
// ../org.wesnoth.wml/src-gen/org/wesnoth/parser/antlr/internal/InternalWML.g:291:8: lv_value_2_6= '.'
{
lv_tagcontent_2_6=(Token)input.LT(1);
lv_value_2_6=(Token)input.LT(1);
match(input,13,FOLLOW_13_in_ruleWMLMacro409);
createLeafNode(grammarAccess.getWMLMacroAccess().getTagcontentFullStopKeyword_2_0_5(), "tagcontent");
createLeafNode(grammarAccess.getWMLMacroAccess().getValueFullStopKeyword_2_0_5(), "value");
if (current==null) {
@ -560,7 +560,7 @@ public class InternalWMLParser extends AbstractInternalAntlrParser {
}
try {
add(current, "tagcontent", lv_tagcontent_2_6, null, lastConsumedNode);
add(current, "value", lv_value_2_6, null, lastConsumedNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
@ -569,12 +569,12 @@ public class InternalWMLParser extends AbstractInternalAntlrParser {
}
break;
case 7 :
// ../org.wesnoth.wml/src-gen/org/wesnoth/parser/antlr/internal/InternalWML.g:309:8: lv_tagcontent_2_7= '('
// ../org.wesnoth.wml/src-gen/org/wesnoth/parser/antlr/internal/InternalWML.g:309:8: lv_value_2_7= '('
{
lv_tagcontent_2_7=(Token)input.LT(1);
lv_value_2_7=(Token)input.LT(1);
match(input,14,FOLLOW_14_in_ruleWMLMacro438);
createLeafNode(grammarAccess.getWMLMacroAccess().getTagcontentLeftParenthesisKeyword_2_0_6(), "tagcontent");
createLeafNode(grammarAccess.getWMLMacroAccess().getValueLeftParenthesisKeyword_2_0_6(), "value");
if (current==null) {
@ -583,7 +583,7 @@ public class InternalWMLParser extends AbstractInternalAntlrParser {
}
try {
add(current, "tagcontent", lv_tagcontent_2_7, null, lastConsumedNode);
add(current, "value", lv_value_2_7, null, lastConsumedNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
@ -592,12 +592,12 @@ public class InternalWMLParser extends AbstractInternalAntlrParser {
}
break;
case 8 :
// ../org.wesnoth.wml/src-gen/org/wesnoth/parser/antlr/internal/InternalWML.g:327:8: lv_tagcontent_2_8= ')'
// ../org.wesnoth.wml/src-gen/org/wesnoth/parser/antlr/internal/InternalWML.g:327:8: lv_value_2_8= ')'
{
lv_tagcontent_2_8=(Token)input.LT(1);
lv_value_2_8=(Token)input.LT(1);
match(input,15,FOLLOW_15_in_ruleWMLMacro467);
createLeafNode(grammarAccess.getWMLMacroAccess().getTagcontentRightParenthesisKeyword_2_0_7(), "tagcontent");
createLeafNode(grammarAccess.getWMLMacroAccess().getValueRightParenthesisKeyword_2_0_7(), "value");
if (current==null) {
@ -606,7 +606,7 @@ public class InternalWMLParser extends AbstractInternalAntlrParser {
}
try {
add(current, "tagcontent", lv_tagcontent_2_8, null, lastConsumedNode);
add(current, "value", lv_value_2_8, null, lastConsumedNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
@ -615,12 +615,12 @@ public class InternalWMLParser extends AbstractInternalAntlrParser {
}
break;
case 9 :
// ../org.wesnoth.wml/src-gen/org/wesnoth/parser/antlr/internal/InternalWML.g:345:8: lv_tagcontent_2_9= '='
// ../org.wesnoth.wml/src-gen/org/wesnoth/parser/antlr/internal/InternalWML.g:345:8: lv_value_2_9= '='
{
lv_tagcontent_2_9=(Token)input.LT(1);
lv_value_2_9=(Token)input.LT(1);
match(input,16,FOLLOW_16_in_ruleWMLMacro496);
createLeafNode(grammarAccess.getWMLMacroAccess().getTagcontentEqualsSignKeyword_2_0_8(), "tagcontent");
createLeafNode(grammarAccess.getWMLMacroAccess().getValueEqualsSignKeyword_2_0_8(), "value");
if (current==null) {
@ -629,7 +629,7 @@ public class InternalWMLParser extends AbstractInternalAntlrParser {
}
try {
add(current, "tagcontent", lv_tagcontent_2_9, null, lastConsumedNode);
add(current, "value", lv_value_2_9, null, lastConsumedNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
@ -638,12 +638,12 @@ public class InternalWMLParser extends AbstractInternalAntlrParser {
}
break;
case 10 :
// ../org.wesnoth.wml/src-gen/org/wesnoth/parser/antlr/internal/InternalWML.g:363:8: lv_tagcontent_2_10= '/'
// ../org.wesnoth.wml/src-gen/org/wesnoth/parser/antlr/internal/InternalWML.g:363:8: lv_value_2_10= '/'
{
lv_tagcontent_2_10=(Token)input.LT(1);
lv_value_2_10=(Token)input.LT(1);
match(input,17,FOLLOW_17_in_ruleWMLMacro525);
createLeafNode(grammarAccess.getWMLMacroAccess().getTagcontentSolidusKeyword_2_0_9(), "tagcontent");
createLeafNode(grammarAccess.getWMLMacroAccess().getValueSolidusKeyword_2_0_9(), "value");
if (current==null) {
@ -652,7 +652,7 @@ public class InternalWMLParser extends AbstractInternalAntlrParser {
}
try {
add(current, "tagcontent", lv_tagcontent_2_10, null, lastConsumedNode);
add(current, "value", lv_value_2_10, null, lastConsumedNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}

66
utils/java/org.wesnoth.wml/src-gen/org/wesnoth/services/WMLGrammarAccess.java
View file

@ -48,73 +48,73 @@ public class WMLGrammarAccess extends AbstractGrammarElementFinder {
private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "WMLMacro");
private final Group cGroup = (Group)rule.eContents().get(1);
private final Keyword cLeftCurlyBracketKeyword_0 = (Keyword)cGroup.eContents().get(0);
private final Assignment cMacroNameAssignment_1 = (Assignment)cGroup.eContents().get(1);
private final RuleCall cMacroNameIDTerminalRuleCall_1_0 = (RuleCall)cMacroNameAssignment_1.eContents().get(0);
private final Assignment cTagcontentAssignment_2 = (Assignment)cGroup.eContents().get(2);
private final Alternatives cTagcontentAlternatives_2_0 = (Alternatives)cTagcontentAssignment_2.eContents().get(0);
private final RuleCall cTagcontentIDTerminalRuleCall_2_0_0 = (RuleCall)cTagcontentAlternatives_2_0.eContents().get(0);
private final RuleCall cTagcontentSTRINGTerminalRuleCall_2_0_1 = (RuleCall)cTagcontentAlternatives_2_0.eContents().get(1);
private final Keyword cTagcontent_Keyword_2_0_2 = (Keyword)cTagcontentAlternatives_2_0.eContents().get(2);
private final Keyword cTagcontentColonKeyword_2_0_3 = (Keyword)cTagcontentAlternatives_2_0.eContents().get(3);
private final Keyword cTagcontentHyphenMinusKeyword_2_0_4 = (Keyword)cTagcontentAlternatives_2_0.eContents().get(4);
private final Keyword cTagcontentFullStopKeyword_2_0_5 = (Keyword)cTagcontentAlternatives_2_0.eContents().get(5);
private final Keyword cTagcontentLeftParenthesisKeyword_2_0_6 = (Keyword)cTagcontentAlternatives_2_0.eContents().get(6);
private final Keyword cTagcontentRightParenthesisKeyword_2_0_7 = (Keyword)cTagcontentAlternatives_2_0.eContents().get(7);
private final Keyword cTagcontentEqualsSignKeyword_2_0_8 = (Keyword)cTagcontentAlternatives_2_0.eContents().get(8);
private final Keyword cTagcontentSolidusKeyword_2_0_9 = (Keyword)cTagcontentAlternatives_2_0.eContents().get(9);
private final Assignment cNameAssignment_1 = (Assignment)cGroup.eContents().get(1);
private final RuleCall cNameIDTerminalRuleCall_1_0 = (RuleCall)cNameAssignment_1.eContents().get(0);
private final Assignment cValueAssignment_2 = (Assignment)cGroup.eContents().get(2);
private final Alternatives cValueAlternatives_2_0 = (Alternatives)cValueAssignment_2.eContents().get(0);
private final RuleCall cValueIDTerminalRuleCall_2_0_0 = (RuleCall)cValueAlternatives_2_0.eContents().get(0);
private final RuleCall cValueSTRINGTerminalRuleCall_2_0_1 = (RuleCall)cValueAlternatives_2_0.eContents().get(1);
private final Keyword cValue_Keyword_2_0_2 = (Keyword)cValueAlternatives_2_0.eContents().get(2);
private final Keyword cValueColonKeyword_2_0_3 = (Keyword)cValueAlternatives_2_0.eContents().get(3);
private final Keyword cValueHyphenMinusKeyword_2_0_4 = (Keyword)cValueAlternatives_2_0.eContents().get(4);
private final Keyword cValueFullStopKeyword_2_0_5 = (Keyword)cValueAlternatives_2_0.eContents().get(5);
private final Keyword cValueLeftParenthesisKeyword_2_0_6 = (Keyword)cValueAlternatives_2_0.eContents().get(6);
private final Keyword cValueRightParenthesisKeyword_2_0_7 = (Keyword)cValueAlternatives_2_0.eContents().get(7);
private final Keyword cValueEqualsSignKeyword_2_0_8 = (Keyword)cValueAlternatives_2_0.eContents().get(8);
private final Keyword cValueSolidusKeyword_2_0_9 = (Keyword)cValueAlternatives_2_0.eContents().get(9);
private final Keyword cRightCurlyBracketKeyword_3 = (Keyword)cGroup.eContents().get(3);
//WMLMacro:
// "{" macroName=ID tagcontent+=(ID | STRING | "_" | ":" | "-" | "." | "(" | ")" | "=" | "/")* "}";
// "{" name=ID value+=(ID | STRING | "_" | ":" | "-" | "." | "(" | ")" | "=" | "/")* "}";
public ParserRule getRule() { return rule; }
//"{" macroName=ID tagcontent+=(ID | STRING | "_" | ":" | "-" | "." | "(" | ")" | "=" | "/")* "}"
//"{" name=ID value+=(ID | STRING | "_" | ":" | "-" | "." | "(" | ")" | "=" | "/")* "}"
public Group getGroup() { return cGroup; }
//"{"
public Keyword getLeftCurlyBracketKeyword_0() { return cLeftCurlyBracketKeyword_0; }
//macroName=ID
public Assignment getMacroNameAssignment_1() { return cMacroNameAssignment_1; }
//name=ID
public Assignment getNameAssignment_1() { return cNameAssignment_1; }
//ID
public RuleCall getMacroNameIDTerminalRuleCall_1_0() { return cMacroNameIDTerminalRuleCall_1_0; }
public RuleCall getNameIDTerminalRuleCall_1_0() { return cNameIDTerminalRuleCall_1_0; }
//tagcontent+=(ID | STRING | "_" | ":" | "-" | "." | "(" | ")" | "=" | "/")*
public Assignment getTagcontentAssignment_2() { return cTagcontentAssignment_2; }
//value+=(ID | STRING | "_" | ":" | "-" | "." | "(" | ")" | "=" | "/")*
public Assignment getValueAssignment_2() { return cValueAssignment_2; }
//ID | STRING | "_" | ":" | "-" | "." | "(" | ")" | "=" | "/"
public Alternatives getTagcontentAlternatives_2_0() { return cTagcontentAlternatives_2_0; }
public Alternatives getValueAlternatives_2_0() { return cValueAlternatives_2_0; }
//ID
public RuleCall getTagcontentIDTerminalRuleCall_2_0_0() { return cTagcontentIDTerminalRuleCall_2_0_0; }
public RuleCall getValueIDTerminalRuleCall_2_0_0() { return cValueIDTerminalRuleCall_2_0_0; }
//STRING
public RuleCall getTagcontentSTRINGTerminalRuleCall_2_0_1() { return cTagcontentSTRINGTerminalRuleCall_2_0_1; }
public RuleCall getValueSTRINGTerminalRuleCall_2_0_1() { return cValueSTRINGTerminalRuleCall_2_0_1; }
//"_"
public Keyword getTagcontent_Keyword_2_0_2() { return cTagcontent_Keyword_2_0_2; }
public Keyword getValue_Keyword_2_0_2() { return cValue_Keyword_2_0_2; }
//":"
public Keyword getTagcontentColonKeyword_2_0_3() { return cTagcontentColonKeyword_2_0_3; }
public Keyword getValueColonKeyword_2_0_3() { return cValueColonKeyword_2_0_3; }
//"-"
public Keyword getTagcontentHyphenMinusKeyword_2_0_4() { return cTagcontentHyphenMinusKeyword_2_0_4; }
public Keyword getValueHyphenMinusKeyword_2_0_4() { return cValueHyphenMinusKeyword_2_0_4; }
//"."
public Keyword getTagcontentFullStopKeyword_2_0_5() { return cTagcontentFullStopKeyword_2_0_5; }
public Keyword getValueFullStopKeyword_2_0_5() { return cValueFullStopKeyword_2_0_5; }
//"("
public Keyword getTagcontentLeftParenthesisKeyword_2_0_6() { return cTagcontentLeftParenthesisKeyword_2_0_6; }
public Keyword getValueLeftParenthesisKeyword_2_0_6() { return cValueLeftParenthesisKeyword_2_0_6; }
//")"
public Keyword getTagcontentRightParenthesisKeyword_2_0_7() { return cTagcontentRightParenthesisKeyword_2_0_7; }
public Keyword getValueRightParenthesisKeyword_2_0_7() { return cValueRightParenthesisKeyword_2_0_7; }
//"="
public Keyword getTagcontentEqualsSignKeyword_2_0_8() { return cTagcontentEqualsSignKeyword_2_0_8; }
public Keyword getValueEqualsSignKeyword_2_0_8() { return cValueEqualsSignKeyword_2_0_8; }
//"/"
public Keyword getTagcontentSolidusKeyword_2_0_9() { return cTagcontentSolidusKeyword_2_0_9; }
public Keyword getValueSolidusKeyword_2_0_9() { return cValueSolidusKeyword_2_0_9; }
//"}"
public Keyword getRightCurlyBracketKeyword_3() { return cRightCurlyBracketKeyword_3; }
@ -642,7 +642,7 @@ public class WMLGrammarAccess extends AbstractGrammarElementFinder {
}
//WMLMacro:
// "{" macroName=ID tagcontent+=(ID | STRING | "_" | ":" | "-" | "." | "(" | ")" | "=" | "/")* "}";
// "{" name=ID value+=(ID | STRING | "_" | ":" | "-" | "." | "(" | ")" | "=" | "/")* "}";
public WMLMacroElements getWMLMacroAccess() {
return (pWMLMacro != null) ? pWMLMacro : (pWMLMacro = new WMLMacroElements());
}

34
utils/java/org.wesnoth.wml/src-gen/org/wesnoth/wML/WMLMacro.java
View file

@ -18,8 +18,8 @@ import org.eclipse.emf.ecore.EObject;
* <p>
* The following features are supported:
* <ul>
* <li>{@link org.wesnoth.wML.WMLMacro#getMacroName <em>Macro Name</em>}</li>
* <li>{@link org.wesnoth.wML.WMLMacro#getTagcontent <em>Tagcontent</em>}</li>
* <li>{@link org.wesnoth.wML.WMLMacro#getName <em>Name</em>}</li>
* <li>{@link org.wesnoth.wML.WMLMacro#getValue <em>Value</em>}</li>
* </ul>
* </p>
*
@ -30,45 +30,45 @@ import org.eclipse.emf.ecore.EObject;
public interface WMLMacro extends EObject
{
/**
* Returns the value of the '<em><b>Macro Name</b></em>' attribute.
* Returns the value of the '<em><b>Name</b></em>' attribute.
* <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Macro Name</em>' attribute isn't clear,
* If the meaning of the '<em>Name</em>' attribute isn't clear,
* there really should be more of a description here...
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Macro Name</em>' attribute.
* @see #setMacroName(String)
* @see org.wesnoth.wML.WMLPackage#getWMLMacro_MacroName()
* @return the value of the '<em>Name</em>' attribute.
* @see #setName(String)
* @see org.wesnoth.wML.WMLPackage#getWMLMacro_Name()
* @model
* @generated
*/
String getMacroName();
String getName();
/**
* Sets the value of the '{@link org.wesnoth.wML.WMLMacro#getMacroName <em>Macro Name</em>}' attribute.
* Sets the value of the '{@link org.wesnoth.wML.WMLMacro#getName <em>Name</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @param value the new value of the '<em>Macro Name</em>' attribute.
* @see #getMacroName()
* @param value the new value of the '<em>Name</em>' attribute.
* @see #getName()
* @generated
*/
void setMacroName(String value);
void setName(String value);
/**
* Returns the value of the '<em><b>Tagcontent</b></em>' attribute list.
* Returns the value of the '<em><b>Value</b></em>' attribute list.
* The list contents are of type {@link java.lang.String}.
* <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Tagcontent</em>' attribute list isn't clear,
* If the meaning of the '<em>Value</em>' attribute list isn't clear,
* there really should be more of a description here...
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Tagcontent</em>' attribute list.
* @see org.wesnoth.wML.WMLPackage#getWMLMacro_Tagcontent()
* @return the value of the '<em>Value</em>' attribute list.
* @see org.wesnoth.wML.WMLPackage#getWMLMacro_Value()
* @model unique="false"
* @generated
*/
EList<String> getTagcontent();
EList<String> getValue();
} // WMLMacro

32
utils/java/org.wesnoth.wml/src-gen/org/wesnoth/wML/WMLPackage.java
View file

@ -108,22 +108,22 @@ public interface WMLPackage extends EPackage
int WML_MACRO = 1;
/**
* The feature id for the '<em><b>Macro Name</b></em>' attribute.
* The feature id for the '<em><b>Name</b></em>' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
int WML_MACRO__MACRO_NAME = 0;
int WML_MACRO__NAME = 0;
/**
* The feature id for the '<em><b>Tagcontent</b></em>' attribute list.
* The feature id for the '<em><b>Value</b></em>' attribute list.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
int WML_MACRO__TAGCONTENT = 1;
int WML_MACRO__VALUE = 1;
/**
* The number of structural features of the '<em>Macro</em>' class.
@ -344,26 +344,26 @@ public interface WMLPackage extends EPackage
EClass getWMLMacro();
/**
* Returns the meta object for the attribute '{@link org.wesnoth.wML.WMLMacro#getMacroName <em>Macro Name</em>}'.
* Returns the meta object for the attribute '{@link org.wesnoth.wML.WMLMacro#getName <em>Name</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return the meta object for the attribute '<em>Macro Name</em>'.
* @see org.wesnoth.wML.WMLMacro#getMacroName()
* @return the meta object for the attribute '<em>Name</em>'.
* @see org.wesnoth.wML.WMLMacro#getName()
* @see #getWMLMacro()
* @generated
*/
EAttribute getWMLMacro_MacroName();
EAttribute getWMLMacro_Name();
/**
* Returns the meta object for the attribute list '{@link org.wesnoth.wML.WMLMacro#getTagcontent <em>Tagcontent</em>}'.
* Returns the meta object for the attribute list '{@link org.wesnoth.wML.WMLMacro#getValue <em>Value</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return the meta object for the attribute list '<em>Tagcontent</em>'.
* @see org.wesnoth.wML.WMLMacro#getTagcontent()
* @return the meta object for the attribute list '<em>Value</em>'.
* @see org.wesnoth.wML.WMLMacro#getValue()
* @see #getWMLMacro()
* @generated
*/
EAttribute getWMLMacro_Tagcontent();
EAttribute getWMLMacro_Value();
/**
* Returns the meta object for class '{@link org.wesnoth.wML.WMLTag <em>Tag</em>}'.
@ -575,20 +575,20 @@ public interface WMLPackage extends EPackage
EClass WML_MACRO = eINSTANCE.getWMLMacro();
/**
* The meta object literal for the '<em><b>Macro Name</b></em>' attribute feature.
* The meta object literal for the '<em><b>Name</b></em>' attribute feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
EAttribute WML_MACRO__MACRO_NAME = eINSTANCE.getWMLMacro_MacroName();
EAttribute WML_MACRO__NAME = eINSTANCE.getWMLMacro_Name();
/**
* The meta object literal for the '<em><b>Tagcontent</b></em>' attribute list feature.
* The meta object literal for the '<em><b>Value</b></em>' attribute list feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
EAttribute WML_MACRO__TAGCONTENT = eINSTANCE.getWMLMacro_Tagcontent();
EAttribute WML_MACRO__VALUE = eINSTANCE.getWMLMacro_Value();
/**
* The meta object literal for the '{@link org.wesnoth.wML.impl.WMLTagImpl <em>Tag</em>}' class.

84
utils/java/org.wesnoth.wml/src-gen/org/wesnoth/wML/impl/WMLMacroImpl.java
View file

@ -29,8 +29,8 @@ import org.wesnoth.wML.WMLPackage;
* <p>
* The following features are implemented:
* <ul>
* <li>{@link org.wesnoth.wML.impl.WMLMacroImpl#getMacroName <em>Macro Name</em>}</li>
* <li>{@link org.wesnoth.wML.impl.WMLMacroImpl#getTagcontent <em>Tagcontent</em>}</li>
* <li>{@link org.wesnoth.wML.impl.WMLMacroImpl#getName <em>Name</em>}</li>
* <li>{@link org.wesnoth.wML.impl.WMLMacroImpl#getValue <em>Value</em>}</li>
* </ul>
* </p>
*
@ -39,34 +39,34 @@ import org.wesnoth.wML.WMLPackage;
public class WMLMacroImpl extends MinimalEObjectImpl.Container implements WMLMacro
{
/**
* The default value of the '{@link #getMacroName() <em>Macro Name</em>}' attribute.
* The default value of the '{@link #getName() <em>Name</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @see #getMacroName()
* @see #getName()
* @generated
* @ordered
*/
protected static final String MACRO_NAME_EDEFAULT = null;
protected static final String NAME_EDEFAULT = null;
/**
* The cached value of the '{@link #getMacroName() <em>Macro Name</em>}' attribute.
* The cached value of the '{@link #getName() <em>Name</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @see #getMacroName()
* @see #getName()
* @generated
* @ordered
*/
protected String macroName = MACRO_NAME_EDEFAULT;
protected String name = NAME_EDEFAULT;
/**
* The cached value of the '{@link #getTagcontent() <em>Tagcontent</em>}' attribute list.
* The cached value of the '{@link #getValue() <em>Value</em>}' attribute list.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @see #getTagcontent()
* @see #getValue()
* @generated
* @ordered
*/
protected EList<String> tagcontent;
protected EList<String> value;
/**
* <!-- begin-user-doc -->
@ -94,9 +94,9 @@ public class WMLMacroImpl extends MinimalEObjectImpl.Container implements WMLMac
* <!-- end-user-doc -->
* @generated
*/
public String getMacroName()
public String getName()
{
return macroName;
return name;
}
/**
@ -104,12 +104,12 @@ public class WMLMacroImpl extends MinimalEObjectImpl.Container implements WMLMac
* <!-- end-user-doc -->
* @generated
*/
public void setMacroName(String newMacroName)
public void setName(String newName)
{
String oldMacroName = macroName;
macroName = newMacroName;
String oldName = name;
name = newName;
if (eNotificationRequired())
eNotify(new ENotificationImpl(this, Notification.SET, WMLPackage.WML_MACRO__MACRO_NAME, oldMacroName, macroName));
eNotify(new ENotificationImpl(this, Notification.SET, WMLPackage.WML_MACRO__NAME, oldName, name));
}
/**
@ -117,13 +117,13 @@ public class WMLMacroImpl extends MinimalEObjectImpl.Container implements WMLMac
* <!-- end-user-doc -->
* @generated
*/
public EList<String> getTagcontent()
public EList<String> getValue()
{
if (tagcontent == null)
if (value == null)
{
tagcontent = new EDataTypeEList<String>(String.class, this, WMLPackage.WML_MACRO__TAGCONTENT);
value = new EDataTypeEList<String>(String.class, this, WMLPackage.WML_MACRO__VALUE);
}
return tagcontent;
return value;
}
/**
@ -136,10 +136,10 @@ public class WMLMacroImpl extends MinimalEObjectImpl.Container implements WMLMac
{
switch (featureID)
{
case WMLPackage.WML_MACRO__MACRO_NAME:
return getMacroName();
case WMLPackage.WML_MACRO__TAGCONTENT:
return getTagcontent();
case WMLPackage.WML_MACRO__NAME:
return getName();
case WMLPackage.WML_MACRO__VALUE:
return getValue();
}
return super.eGet(featureID, resolve, coreType);
}
@ -155,12 +155,12 @@ public class WMLMacroImpl extends MinimalEObjectImpl.Container implements WMLMac
{
switch (featureID)
{
case WMLPackage.WML_MACRO__MACRO_NAME:
setMacroName((String)newValue);
case WMLPackage.WML_MACRO__NAME:
setName((String)newValue);
return;
case WMLPackage.WML_MACRO__TAGCONTENT:
getTagcontent().clear();
getTagcontent().addAll((Collection<? extends String>)newValue);
case WMLPackage.WML_MACRO__VALUE:
getValue().clear();
getValue().addAll((Collection<? extends String>)newValue);
return;
}
super.eSet(featureID, newValue);
@ -176,11 +176,11 @@ public class WMLMacroImpl extends MinimalEObjectImpl.Container implements WMLMac
{
switch (featureID)
{
case WMLPackage.WML_MACRO__MACRO_NAME:
setMacroName(MACRO_NAME_EDEFAULT);
case WMLPackage.WML_MACRO__NAME:
setName(NAME_EDEFAULT);
return;
case WMLPackage.WML_MACRO__TAGCONTENT:
getTagcontent().clear();
case WMLPackage.WML_MACRO__VALUE:
getValue().clear();
return;
}
super.eUnset(featureID);
@ -196,10 +196,10 @@ public class WMLMacroImpl extends MinimalEObjectImpl.Container implements WMLMac
{
switch (featureID)
{
case WMLPackage.WML_MACRO__MACRO_NAME:
return MACRO_NAME_EDEFAULT == null ? macroName != null : !MACRO_NAME_EDEFAULT.equals(macroName);
case WMLPackage.WML_MACRO__TAGCONTENT:
return tagcontent != null && !tagcontent.isEmpty();
case WMLPackage.WML_MACRO__NAME:
return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
case WMLPackage.WML_MACRO__VALUE:
return value != null && !value.isEmpty();
}
return super.eIsSet(featureID);
}
@ -215,10 +215,10 @@ public class WMLMacroImpl extends MinimalEObjectImpl.Container implements WMLMac
if (eIsProxy()) return super.toString();
StringBuffer result = new StringBuffer(super.toString());
result.append(" (macroName: ");
result.append(macroName);
result.append(", tagcontent: ");
result.append(tagcontent);
result.append(" (name: ");
result.append(name);
result.append(", value: ");
result.append(value);
result.append(')');
return result.toString();
}

12
utils/java/org.wesnoth.wml/src-gen/org/wesnoth/wML/impl/WMLPackageImpl.java
View file

@ -180,7 +180,7 @@ public class WMLPackageImpl extends EPackageImpl implements WMLPackage
* <!-- end-user-doc -->
* @generated
*/
public EAttribute getWMLMacro_MacroName()
public EAttribute getWMLMacro_Name()
{
return (EAttribute)wmlMacroEClass.getEStructuralFeatures().get(0);
}
@ -190,7 +190,7 @@ public class WMLPackageImpl extends EPackageImpl implements WMLPackage
* <!-- end-user-doc -->
* @generated
*/
public EAttribute getWMLMacro_Tagcontent()
public EAttribute getWMLMacro_Value()
{
return (EAttribute)wmlMacroEClass.getEStructuralFeatures().get(1);
}
@ -370,8 +370,8 @@ public class WMLPackageImpl extends EPackageImpl implements WMLPackage
createEReference(wmlRootEClass, WML_ROOT__RMACROS);
wmlMacroEClass = createEClass(WML_MACRO);
createEAttribute(wmlMacroEClass, WML_MACRO__MACRO_NAME);
createEAttribute(wmlMacroEClass, WML_MACRO__TAGCONTENT);
createEAttribute(wmlMacroEClass, WML_MACRO__NAME);
createEAttribute(wmlMacroEClass, WML_MACRO__VALUE);
wmlTagEClass = createEClass(WML_TAG);
createEAttribute(wmlTagEClass, WML_TAG__NAME);
@ -428,8 +428,8 @@ public class WMLPackageImpl extends EPackageImpl implements WMLPackage
initEReference(getWMLRoot_Rmacros(), this.getWMLMacro(), null, "Rmacros", null, 0, -1, WMLRoot.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEClass(wmlMacroEClass, WMLMacro.class, "WMLMacro", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
initEAttribute(getWMLMacro_MacroName(), ecorePackage.getEString(), "macroName", null, 0, 1, WMLMacro.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEAttribute(getWMLMacro_Tagcontent(), ecorePackage.getEString(), "tagcontent", null, 0, -1, WMLMacro.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEAttribute(getWMLMacro_Name(), ecorePackage.getEString(), "name", null, 0, 1, WMLMacro.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEAttribute(getWMLMacro_Value(), ecorePackage.getEString(), "value", null, 0, -1, WMLMacro.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEClass(wmlTagEClass, WMLTag.class, "WMLTag", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
initEAttribute(getWMLTag_Name(), ecorePackage.getEString(), "name", null, 0, 1, WMLTag.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

2
utils/java/org.wesnoth.wml/src/org/wesnoth/WML.xtext
View file

@ -14,7 +14,7 @@ WMLRoot:
;
WMLMacro:
'{' macroName = ID (tagcontent +=(ID|STRING|'_'|':'|'-'|'.'|'('|')'|'='|'/')+)* '}';
'{' name = ID (value +=(ID|STRING|'_'|':'|'-'|'.'|'('|')'|'='|'/')+)* '}';
WMLTag:
'[' name = ID ']'