summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormclay2009-01-14 11:58:07 (EST)
committer sefftinge2009-01-14 11:58:07 (EST)
commit0208e96779a14388c0b5e4759e4f65fa08d976e0 (patch)
tree272e5b9caf98ef46014b36188322d5ea7c361933
parent9ec2182f60691d1d874d7dd79c3aeced5a53d5d4 (diff)
downloadorg.eclipse.xtext-0208e96779a14388c0b5e4759e4f65fa08d976e0.zip
org.eclipse.xtext-0208e96779a14388c0b5e4759e4f65fa08d976e0.tar.gz
org.eclipse.xtext-0208e96779a14388c0b5e4759e4f65fa08d976e0.tar.bz2
upd: generate
-rw-r--r--examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.tokens32
-rw-r--r--examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodelLexer.java42
-rw-r--r--examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodelParser.java10
-rw-r--r--examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/DomainmodelDelimiters.java20
-rw-r--r--examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/DomainmodelParserConfiguration.java49
-rw-r--r--examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelAttributeConsumer.java43
-rw-r--r--examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelDataTypeConsumer.java30
-rw-r--r--examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelEntityConsumer.java82
-rw-r--r--examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelFeatureConsumer.java16
-rw-r--r--examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelFileConsumer.java4
-rw-r--r--examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelImportConsumer.java30
-rw-r--r--examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelNamedElementConsumer.java4
-rw-r--r--examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelOperationConsumer.java94
-rw-r--r--examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelPackageConsumer.java51
-rw-r--r--examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelParameterConsumer.java17
-rw-r--r--examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelQualifiedNameConsumer.java43
-rw-r--r--examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelReferenceConsumer.java69
-rw-r--r--examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelStructuralFeatureConsumer.java16
-rw-r--r--examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelTypeConsumer.java4
-rw-r--r--examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelTypeRefConsumer.java17
-rw-r--r--examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelTypedElementConsumer.java16
-rw-r--r--examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/services/DomainmodelMetamodelAccess.java2
22 files changed, 544 insertions, 147 deletions
diff --git a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.tokens b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.tokens
index ace18c0..825904e 100644
--- a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.tokens
+++ b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.tokens
@@ -1,23 +1,23 @@
+RULE_ML_COMMENT=7
RULE_ID=5
+RULE_WS=9
+RULE_INT=6
RULE_STRING=4
RULE_ANY_OTHER=10
-RULE_INT=6
-RULE_WS=9
RULE_SL_COMMENT=8
-RULE_ML_COMMENT=7
-'}'=14
-'op'=22
-'extends'=17
-'{'=13
-'package'=12
-'datatype'=15
-'attr'=18
-'entity'=16
'opposite'=21
-':'=19
-'ref'=20
-'('=23
-','=24
-'.'=26
')'=25
+'datatype'=15
+'package'=12
'import'=11
+'{'=13
+','=24
+'('=23
+':'=19
+'op'=22
+'attr'=18
+'.'=26
+'extends'=17
+'ref'=20
+'}'=14
+'entity'=16
diff --git a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodelLexer.java b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodelLexer.java
index cd9d816..fbe50f4 100644
--- a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodelLexer.java
+++ b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodelLexer.java
@@ -1,4 +1,4 @@
-// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g 2009-01-14 11:41:32
+// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g 2009-01-14 17:57:10
package org.eclipse.xtext.example.parser.antlr.internal;
@@ -13,30 +13,30 @@ import java.util.List;
import java.util.ArrayList;
public class InternalDomainmodelLexer extends Lexer {
- public static final int RULE_ID=5;
- public static final int RULE_ANY_OTHER=10;
- public static final int T26=26;
- public static final int T25=25;
- public static final int Tokens=27;
- public static final int T24=24;
- public static final int EOF=-1;
- public static final int RULE_SL_COMMENT=8;
- public static final int T23=23;
- public static final int T22=22;
public static final int T21=21;
- public static final int T20=20;
public static final int RULE_ML_COMMENT=7;
- public static final int RULE_STRING=4;
- public static final int RULE_INT=6;
+ public static final int T14=14;
+ public static final int RULE_ID=5;
+ public static final int T22=22;
public static final int T11=11;
+ public static final int RULE_STRING=4;
public static final int T12=12;
+ public static final int T23=23;
public static final int T13=13;
- public static final int T14=14;
+ public static final int T20=20;
+ public static final int T25=25;
+ public static final int T18=18;
public static final int RULE_WS=9;
+ public static final int T26=26;
public static final int T15=15;
- public static final int T16=16;
+ public static final int RULE_INT=6;
+ public static final int EOF=-1;
public static final int T17=17;
- public static final int T18=18;
+ public static final int Tokens=27;
+ public static final int RULE_ANY_OTHER=10;
+ public static final int T16=16;
+ public static final int RULE_SL_COMMENT=8;
+ public static final int T24=24;
public static final int T19=19;
public InternalDomainmodelLexer() {;}
public InternalDomainmodelLexer(CharStream input) {
@@ -1290,14 +1290,14 @@ public class InternalDomainmodelLexer extends Lexer {
}
else if ( (LA12_0=='/') ) {
switch ( input.LA(2) ) {
- case '/':
+ case '*':
{
- alt12=21;
+ alt12=20;
}
break;
- case '*':
+ case '/':
{
- alt12=20;
+ alt12=21;
}
break;
default:
diff --git a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodelParser.java b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodelParser.java
index 720a2e6..3db0b39 100644
--- a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodelParser.java
+++ b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodelParser.java
@@ -1,4 +1,4 @@
-// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g 2009-01-14 11:41:31
+// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g 2009-01-14 17:57:10
package org.eclipse.xtext.example.parser.antlr.internal;
@@ -25,14 +25,14 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
public static final String[] tokenNames = new String[] {
"<invalid>", "<EOR>", "<DOWN>", "<UP>", "RULE_STRING", "RULE_ID", "RULE_INT", "RULE_ML_COMMENT", "RULE_SL_COMMENT", "RULE_WS", "RULE_ANY_OTHER", "'import'", "'package'", "'{'", "'}'", "'datatype'", "'entity'", "'extends'", "'attr'", "':'", "'ref'", "'opposite'", "'op'", "'('", "','", "')'", "'.'"
};
+ public static final int RULE_ML_COMMENT=7;
public static final int RULE_ID=5;
+ public static final int RULE_WS=9;
+ public static final int EOF=-1;
+ public static final int RULE_INT=6;
public static final int RULE_STRING=4;
public static final int RULE_ANY_OTHER=10;
- public static final int RULE_INT=6;
- public static final int RULE_WS=9;
public static final int RULE_SL_COMMENT=8;
- public static final int EOF=-1;
- public static final int RULE_ML_COMMENT=7;
public InternalDomainmodelParser(TokenStream input) {
super(input);
diff --git a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/DomainmodelDelimiters.java b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/DomainmodelDelimiters.java
index 8d137a7..efe36b3 100644
--- a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/DomainmodelDelimiters.java
+++ b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/DomainmodelDelimiters.java
@@ -8,14 +8,20 @@ import org.eclipse.xtext.parser.packrat.matching.ICharacterClass;
import org.eclipse.xtext.parser.packrat.matching.ISequenceMatcher;
import org.eclipse.xtext.parser.packrat.matching.SetBasedKeywordMatcher;
-import org.eclipse.xtext.example.services.DomainmodelGrammarAccess;
+public final class DomainmodelDelimiters {
-public class DomainmodelDelimiters {
-
- public static ICharacterClass ID_DELIMITER = XtextBuiltinIDConsumer.IDConsumer$$2;
+ private DomainmodelDelimiters() {
+ throw new UnsupportedOperationException("Utility classes may not be initialized");
+ }
- public static ICharacterClass ANY_OTHER_DELIMITER = ICharacterClass.Factory.nullClass();
+ // TODO do not use IDConsumer internals
+ public static ICharacterClass keyword$12$Delimiter = XtextBuiltinIDConsumer.IDConsumer$$2;
- public static ISequenceMatcher ALL_KEYWORDS = new SetBasedKeywordMatcher(DomainmodelGrammarAccess.INSTANCE.getGrammar());
-
+ public static ISequenceMatcher ruleCall$14$Delimiter = ISequenceMatcher.Factory.nullMatcher();
+
+ public static ICharacterClass keyword$29$Delimiter = ICharacterClass.Factory.nullClass();
+
+ public static ISequenceMatcher ruleCall$43$Delimiter = new SetBasedKeywordMatcher(
+ "import", "package", "datatype", "entity", "extends", "attr", "ref", "opposite", "op");
+
}
diff --git a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/DomainmodelParserConfiguration.java b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/DomainmodelParserConfiguration.java
index 37eac64..a138a9b 100644
--- a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/DomainmodelParserConfiguration.java
+++ b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/DomainmodelParserConfiguration.java
@@ -136,8 +136,8 @@ public class DomainmodelParserConfiguration extends AbstractParserConfiguration
getNamedElementConsumer().setPackageConsumer(getPackageConsumer());
getNamedElementConsumer().setTypeConsumer(getTypeConsumer());
- getPackageConsumer().setQualifiedNameConsumer(getQualifiedNameConsumer());
getPackageConsumer().setNamedElementConsumer(getNamedElementConsumer());
+ getPackageConsumer().setQualifiedNameConsumer(getQualifiedNameConsumer());
getTypeConsumer().setDataTypeConsumer(getDataTypeConsumer());
getTypeConsumer().setEntityConsumer(getEntityConsumer());
@@ -147,11 +147,11 @@ public class DomainmodelParserConfiguration extends AbstractParserConfiguration
getEntityConsumer().setFeatureConsumer(getFeatureConsumer());
getEntityConsumer().setIdConsumer(getIdConsumer());
- getFeatureConsumer().setStructuralFeatureConsumer(getStructuralFeatureConsumer());
getFeatureConsumer().setOperationConsumer(getOperationConsumer());
+ getFeatureConsumer().setStructuralFeatureConsumer(getStructuralFeatureConsumer());
- getStructuralFeatureConsumer().setReferenceConsumer(getReferenceConsumer());
getStructuralFeatureConsumer().setAttributeConsumer(getAttributeConsumer());
+ getStructuralFeatureConsumer().setReferenceConsumer(getReferenceConsumer());
getAttributeConsumer().setIdConsumer(getIdConsumer());
getAttributeConsumer().setTypeRefConsumer(getTypeRefConsumer());
@@ -159,26 +159,65 @@ public class DomainmodelParserConfiguration extends AbstractParserConfiguration
getReferenceConsumer().setIdConsumer(getIdConsumer());
getReferenceConsumer().setTypeRefConsumer(getTypeRefConsumer());
- getOperationConsumer().setParameterConsumer(getParameterConsumer());
getOperationConsumer().setIdConsumer(getIdConsumer());
+ getOperationConsumer().setParameterConsumer(getParameterConsumer());
getOperationConsumer().setTypeRefConsumer(getTypeRefConsumer());
getParameterConsumer().setIdConsumer(getIdConsumer());
getParameterConsumer().setTypeRefConsumer(getTypeRefConsumer());
- getTypedElementConsumer().setParameterConsumer(getParameterConsumer());
getTypedElementConsumer().setFeatureConsumer(getFeatureConsumer());
+ getTypedElementConsumer().setParameterConsumer(getParameterConsumer());
getTypeRefConsumer().setIdConsumer(getIdConsumer());
getQualifiedNameConsumer().setIdConsumer(getIdConsumer());
+ getImportConsumer().setKeyword$2$Delimiter(DomainmodelDelimiters.keyword$12$Delimiter);
+ getImportConsumer().setRuleCall$4$Delimiter(DomainmodelDelimiters.ruleCall$14$Delimiter);
+ getPackageConsumer().setKeyword$8$Delimiter(DomainmodelDelimiters.keyword$29$Delimiter);
+ getPackageConsumer().setKeyword$11$Delimiter(DomainmodelDelimiters.keyword$29$Delimiter);
+ getPackageConsumer().setKeyword$5$Delimiter(DomainmodelDelimiters.keyword$12$Delimiter);
+ getDataTypeConsumer().setKeyword$2$Delimiter(DomainmodelDelimiters.keyword$12$Delimiter);
+ getDataTypeConsumer().setRuleCall$4$Delimiter(DomainmodelDelimiters.ruleCall$43$Delimiter);
+ getEntityConsumer().setRuleCall$8$Delimiter(DomainmodelDelimiters.ruleCall$43$Delimiter);
+ getEntityConsumer().setKeyword$17$Delimiter(DomainmodelDelimiters.keyword$29$Delimiter);
+ getEntityConsumer().setCrossReference$12$Delimiter(DomainmodelDelimiters.ruleCall$43$Delimiter);
+ getEntityConsumer().setKeyword$14$Delimiter(DomainmodelDelimiters.keyword$29$Delimiter);
+ getEntityConsumer().setKeyword$10$Delimiter(DomainmodelDelimiters.keyword$12$Delimiter);
+ getEntityConsumer().setKeyword$6$Delimiter(DomainmodelDelimiters.keyword$12$Delimiter);
+ getAttributeConsumer().setRuleCall$6$Delimiter(DomainmodelDelimiters.ruleCall$43$Delimiter);
+ getAttributeConsumer().setKeyword$7$Delimiter(DomainmodelDelimiters.keyword$29$Delimiter);
+ getAttributeConsumer().setKeyword$4$Delimiter(DomainmodelDelimiters.keyword$12$Delimiter);
+ getReferenceConsumer().setKeyword$12$Delimiter(DomainmodelDelimiters.keyword$12$Delimiter);
+ getReferenceConsumer().setRuleCall$7$Delimiter(DomainmodelDelimiters.ruleCall$43$Delimiter);
+ getReferenceConsumer().setKeyword$8$Delimiter(DomainmodelDelimiters.keyword$29$Delimiter);
+ getReferenceConsumer().setCrossReference$14$Delimiter(DomainmodelDelimiters.ruleCall$43$Delimiter);
+ getReferenceConsumer().setKeyword$5$Delimiter(DomainmodelDelimiters.keyword$12$Delimiter);
+ getOperationConsumer().setRuleCall$9$Delimiter(DomainmodelDelimiters.ruleCall$43$Delimiter);
+ getOperationConsumer().setKeyword$18$Delimiter(DomainmodelDelimiters.keyword$29$Delimiter);
+ getOperationConsumer().setKeyword$10$Delimiter(DomainmodelDelimiters.keyword$29$Delimiter);
+ getOperationConsumer().setKeyword$15$Delimiter(DomainmodelDelimiters.keyword$29$Delimiter);
+ getOperationConsumer().setKeyword$7$Delimiter(DomainmodelDelimiters.keyword$12$Delimiter);
+ getOperationConsumer().setKeyword$19$Delimiter(DomainmodelDelimiters.keyword$29$Delimiter);
+ getParameterConsumer().setRuleCall$3$Delimiter(DomainmodelDelimiters.ruleCall$43$Delimiter);
+ getTypeRefConsumer().setCrossReference$2$Delimiter(DomainmodelDelimiters.ruleCall$43$Delimiter);
+ getQualifiedNameConsumer().setKeyword$4$Delimiter(DomainmodelDelimiters.keyword$29$Delimiter);
+ getQualifiedNameConsumer().setRuleCall$5$Delimiter(DomainmodelDelimiters.ruleCall$43$Delimiter);
+ getQualifiedNameConsumer().setRuleCall$2$Delimiter(DomainmodelDelimiters.ruleCall$43$Delimiter);
+ // TODO remove workaround
getIdConsumer().initFields(this);
+ // TODO remove workaround
getIntConsumer().initFields(this);
+ // TODO remove workaround
getStringConsumer().initFields(this);
+ // TODO remove workaround
getMlCommentConsumer().initFields(this);
+ // TODO remove workaround
getSlCommentConsumer().initFields(this);
+ // TODO remove workaround
getWsConsumer().initFields(this);
+ // TODO remove workaround
getAnyOtherConsumer().initFields(this);
}
diff --git a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelAttributeConsumer.java b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelAttributeConsumer.java
index 85c5124..f8c61fd 100644
--- a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelAttributeConsumer.java
+++ b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelAttributeConsumer.java
@@ -11,13 +11,13 @@ import org.eclipse.xtext.parser.packrat.IMarkerFactory.IMarker;
import org.eclipse.xtext.parser.packrat.consumers.IConsumerUtility;
import org.eclipse.xtext.parser.packrat.consumers.ITerminalConsumer;
import org.eclipse.xtext.parser.packrat.consumers.NonTerminalConsumer;
+import org.eclipse.xtext.parser.packrat.matching.ICharacterClass;
+import org.eclipse.xtext.parser.packrat.matching.ISequenceMatcher;
import org.eclipse.xtext.parser.packrat.tokens.IParsedTokenAcceptor;
import org.eclipse.xtext.example.services.DomainmodelGrammarAccess;
import org.eclipse.xtext.example.services.DomainmodelGrammarAccess.AttributeElements;
-import org.eclipse.xtext.example.parser.packrat.DomainmodelDelimiters;
-
import org.eclipse.xtext.builtin.parser.packrat.consumers.XtextBuiltinIDConsumer;
import org.eclipse.xtext.example.parser.packrat.consumers.DomainmodelTypeRefConsumer;
@@ -27,10 +27,19 @@ public final class DomainmodelAttributeConsumer extends NonTerminalConsumer {
private XtextBuiltinIDConsumer idConsumer;
private DomainmodelTypeRefConsumer typeRefConsumer;
+ private ISequenceMatcher ruleCall$6$Delimiter;
+
+ private ICharacterClass keyword$7$Delimiter;
+
+ private ICharacterClass keyword$4$Delimiter;
+
public DomainmodelAttributeConsumer(ICharSequenceWithOffset input, IMarkerFactory markerFactory,
IParsedTokenAcceptor tokenAcceptor, IHiddenTokenHandler hiddenTokenHandler, IConsumerUtility consumerUtil,
ITerminalConsumer[] hiddenTokens) {
super(input, markerFactory, tokenAcceptor, hiddenTokenHandler, consumerUtil, hiddenTokens);
+ ruleCall$6$Delimiter = ISequenceMatcher.Factory.nullMatcher();
+ keyword$7$Delimiter = ICharacterClass.Factory.nullClass();
+ keyword$4$Delimiter = ICharacterClass.Factory.nullClass();
}
protected boolean doConsume() throws Exception {
@@ -59,17 +68,17 @@ public final class DomainmodelAttributeConsumer extends NonTerminalConsumer {
}
protected boolean consumeKeyword$4() throws Exception {
- return consumeKeyword(getRule().ele000KeywordAttr(), null, false, false, DomainmodelDelimiters.ID_DELIMITER);
+ return consumeKeyword(getRule().ele000KeywordAttr(), null, false, false, getKeyword$4$Delimiter());
}
protected boolean consumeAssignment$5() throws Exception {
- if (consumeTerminal(idConsumer, "name", false, false, getRule().ele0010LexerRuleCallID(), DomainmodelDelimiters.ALL_KEYWORDS))
+ if (consumeTerminal(idConsumer, "name", false, false, getRule().ele0010LexerRuleCallID(), getRuleCall$6$Delimiter()))
return true;
return false;
}
protected boolean consumeKeyword$7() throws Exception {
- return consumeKeyword(getRule().ele01KeywordColon(), null, false, false, DomainmodelDelimiters.ANY_OTHER_DELIMITER);
+ return consumeKeyword(getRule().ele01KeywordColon(), null, false, false, getKeyword$7$Delimiter());
}
protected boolean consumeAssignment$8() throws Exception {
@@ -99,4 +108,28 @@ public final class DomainmodelAttributeConsumer extends NonTerminalConsumer {
this.typeRefConsumer = typeRefConsumer;
}
+ public ISequenceMatcher getRuleCall$6$Delimiter() {
+ return ruleCall$6$Delimiter;
+ }
+
+ public void setRuleCall$6$Delimiter(ISequenceMatcher matcher) {
+ ruleCall$6$Delimiter = matcher != null ? matcher : ISequenceMatcher.Factory.nullMatcher();
+ }
+
+ public ICharacterClass getKeyword$7$Delimiter() {
+ return keyword$7$Delimiter;
+ }
+
+ public void setKeyword$7$Delimiter(ICharacterClass characterClass) {
+ keyword$7$Delimiter = characterClass != null ? characterClass : ICharacterClass.Factory.nullClass();
+ }
+
+ public ICharacterClass getKeyword$4$Delimiter() {
+ return keyword$4$Delimiter;
+ }
+
+ public void setKeyword$4$Delimiter(ICharacterClass characterClass) {
+ keyword$4$Delimiter = characterClass != null ? characterClass : ICharacterClass.Factory.nullClass();
+ }
+
}
diff --git a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelDataTypeConsumer.java b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelDataTypeConsumer.java
index 210e191..f5c0035 100644
--- a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelDataTypeConsumer.java
+++ b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelDataTypeConsumer.java
@@ -11,13 +11,13 @@ import org.eclipse.xtext.parser.packrat.IMarkerFactory.IMarker;
import org.eclipse.xtext.parser.packrat.consumers.IConsumerUtility;
import org.eclipse.xtext.parser.packrat.consumers.ITerminalConsumer;
import org.eclipse.xtext.parser.packrat.consumers.NonTerminalConsumer;
+import org.eclipse.xtext.parser.packrat.matching.ICharacterClass;
+import org.eclipse.xtext.parser.packrat.matching.ISequenceMatcher;
import org.eclipse.xtext.parser.packrat.tokens.IParsedTokenAcceptor;
import org.eclipse.xtext.example.services.DomainmodelGrammarAccess;
import org.eclipse.xtext.example.services.DomainmodelGrammarAccess.DataTypeElements;
-import org.eclipse.xtext.example.parser.packrat.DomainmodelDelimiters;
-
import org.eclipse.xtext.builtin.parser.packrat.consumers.XtextBuiltinIDConsumer;
@SuppressWarnings("unused")
@@ -25,10 +25,16 @@ public final class DomainmodelDataTypeConsumer extends NonTerminalConsumer {
private XtextBuiltinIDConsumer idConsumer;
+ private ICharacterClass keyword$2$Delimiter;
+
+ private ISequenceMatcher ruleCall$4$Delimiter;
+
public DomainmodelDataTypeConsumer(ICharSequenceWithOffset input, IMarkerFactory markerFactory,
IParsedTokenAcceptor tokenAcceptor, IHiddenTokenHandler hiddenTokenHandler, IConsumerUtility consumerUtil,
ITerminalConsumer[] hiddenTokens) {
super(input, markerFactory, tokenAcceptor, hiddenTokenHandler, consumerUtil, hiddenTokens);
+ keyword$2$Delimiter = ICharacterClass.Factory.nullClass();
+ ruleCall$4$Delimiter = ISequenceMatcher.Factory.nullMatcher();
}
protected boolean doConsume() throws Exception {
@@ -49,11 +55,11 @@ public final class DomainmodelDataTypeConsumer extends NonTerminalConsumer {
}
protected boolean consumeKeyword$2() throws Exception {
- return consumeKeyword(getRule().ele0KeywordDatatype(), null, false, false, DomainmodelDelimiters.ID_DELIMITER);
+ return consumeKeyword(getRule().ele0KeywordDatatype(), null, false, false, getKeyword$2$Delimiter());
}
protected boolean consumeAssignment$3() throws Exception {
- if (consumeTerminal(idConsumer, "name", false, false, getRule().ele10LexerRuleCallID(), DomainmodelDelimiters.ALL_KEYWORDS))
+ if (consumeTerminal(idConsumer, "name", false, false, getRule().ele10LexerRuleCallID(), getRuleCall$4$Delimiter()))
return true;
return false;
}
@@ -75,4 +81,20 @@ public final class DomainmodelDataTypeConsumer extends NonTerminalConsumer {
this.idConsumer = idConsumer;
}
+ public ICharacterClass getKeyword$2$Delimiter() {
+ return keyword$2$Delimiter;
+ }
+
+ public void setKeyword$2$Delimiter(ICharacterClass characterClass) {
+ keyword$2$Delimiter = characterClass != null ? characterClass : ICharacterClass.Factory.nullClass();
+ }
+
+ public ISequenceMatcher getRuleCall$4$Delimiter() {
+ return ruleCall$4$Delimiter;
+ }
+
+ public void setRuleCall$4$Delimiter(ISequenceMatcher matcher) {
+ ruleCall$4$Delimiter = matcher != null ? matcher : ISequenceMatcher.Factory.nullMatcher();
+ }
+
}
diff --git a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelEntityConsumer.java b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelEntityConsumer.java
index a9b2b67..cef6b46 100644
--- a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelEntityConsumer.java
+++ b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelEntityConsumer.java
@@ -11,13 +11,13 @@ import org.eclipse.xtext.parser.packrat.IMarkerFactory.IMarker;
import org.eclipse.xtext.parser.packrat.consumers.IConsumerUtility;
import org.eclipse.xtext.parser.packrat.consumers.ITerminalConsumer;
import org.eclipse.xtext.parser.packrat.consumers.NonTerminalConsumer;
+import org.eclipse.xtext.parser.packrat.matching.ICharacterClass;
+import org.eclipse.xtext.parser.packrat.matching.ISequenceMatcher;
import org.eclipse.xtext.parser.packrat.tokens.IParsedTokenAcceptor;
import org.eclipse.xtext.example.services.DomainmodelGrammarAccess;
import org.eclipse.xtext.example.services.DomainmodelGrammarAccess.EntityElements;
-import org.eclipse.xtext.example.parser.packrat.DomainmodelDelimiters;
-
import org.eclipse.xtext.example.parser.packrat.consumers.DomainmodelFeatureConsumer;
import org.eclipse.xtext.builtin.parser.packrat.consumers.XtextBuiltinIDConsumer;
@@ -27,10 +27,28 @@ public final class DomainmodelEntityConsumer extends NonTerminalConsumer {
private DomainmodelFeatureConsumer featureConsumer;
private XtextBuiltinIDConsumer idConsumer;
+ private ISequenceMatcher ruleCall$8$Delimiter;
+
+ private ICharacterClass keyword$17$Delimiter;
+
+ private ISequenceMatcher crossReference$12$Delimiter;
+
+ private ICharacterClass keyword$14$Delimiter;
+
+ private ICharacterClass keyword$10$Delimiter;
+
+ private ICharacterClass keyword$6$Delimiter;
+
public DomainmodelEntityConsumer(ICharSequenceWithOffset input, IMarkerFactory markerFactory,
IParsedTokenAcceptor tokenAcceptor, IHiddenTokenHandler hiddenTokenHandler, IConsumerUtility consumerUtil,
ITerminalConsumer[] hiddenTokens) {
super(input, markerFactory, tokenAcceptor, hiddenTokenHandler, consumerUtil, hiddenTokens);
+ ruleCall$8$Delimiter = ISequenceMatcher.Factory.nullMatcher();
+ keyword$17$Delimiter = ICharacterClass.Factory.nullClass();
+ crossReference$12$Delimiter = ISequenceMatcher.Factory.nullMatcher();
+ keyword$14$Delimiter = ICharacterClass.Factory.nullClass();
+ keyword$10$Delimiter = ICharacterClass.Factory.nullClass();
+ keyword$6$Delimiter = ICharacterClass.Factory.nullClass();
}
protected boolean doConsume() throws Exception {
@@ -67,11 +85,11 @@ public final class DomainmodelEntityConsumer extends NonTerminalConsumer {
}
protected boolean consumeKeyword$6() throws Exception {
- return consumeKeyword(getRule().ele00000KeywordEntity(), null, false, false, DomainmodelDelimiters.ID_DELIMITER);
+ return consumeKeyword(getRule().ele00000KeywordEntity(), null, false, false, getKeyword$6$Delimiter());
}
protected boolean consumeAssignment$7() throws Exception {
- if (consumeTerminal(idConsumer, "name", false, false, getRule().ele000010LexerRuleCallID(), DomainmodelDelimiters.ALL_KEYWORDS))
+ if (consumeTerminal(idConsumer, "name", false, false, getRule().ele000010LexerRuleCallID(), getRuleCall$8$Delimiter()))
return true;
return false;
}
@@ -95,17 +113,17 @@ public final class DomainmodelEntityConsumer extends NonTerminalConsumer {
}
protected boolean consumeKeyword$10() throws Exception {
- return consumeKeyword(getRule().ele00010KeywordExtends(), null, false, false, DomainmodelDelimiters.ID_DELIMITER);
+ return consumeKeyword(getRule().ele00010KeywordExtends(), null, false, false, getKeyword$10$Delimiter());
}
protected boolean consumeAssignment$11() throws Exception {
- if (consumeTerminal(idConsumer, null, false, false, getRule().ele000110CrossReferenceEStringEntity(), DomainmodelDelimiters.ALL_KEYWORDS))
+ if (consumeTerminal(idConsumer, null, false, false, getRule().ele000110CrossReferenceEStringEntity(), getCrossReference$12$Delimiter()))
return true;
return false;
}
protected boolean consumeKeyword$14() throws Exception {
- return consumeKeyword(getRule().ele001KeywordLeftCurlyBracket(), null, false, false, DomainmodelDelimiters.ANY_OTHER_DELIMITER);
+ return consumeKeyword(getRule().ele001KeywordLeftCurlyBracket(), null, false, false, getKeyword$14$Delimiter());
}
protected boolean consumeAssignment$15() throws Exception {
@@ -120,7 +138,7 @@ public final class DomainmodelEntityConsumer extends NonTerminalConsumer {
}
protected boolean consumeKeyword$17() throws Exception {
- return consumeKeyword(getRule().ele1KeywordRightCurlyBracket(), null, false, false, DomainmodelDelimiters.ANY_OTHER_DELIMITER);
+ return consumeKeyword(getRule().ele1KeywordRightCurlyBracket(), null, false, false, getKeyword$17$Delimiter());
}
public EntityElements getRule() {
@@ -144,4 +162,52 @@ public final class DomainmodelEntityConsumer extends NonTerminalConsumer {
this.idConsumer = idConsumer;
}
+ public ISequenceMatcher getRuleCall$8$Delimiter() {
+ return ruleCall$8$Delimiter;
+ }
+
+ public void setRuleCall$8$Delimiter(ISequenceMatcher matcher) {
+ ruleCall$8$Delimiter = matcher != null ? matcher : ISequenceMatcher.Factory.nullMatcher();
+ }
+
+ public ICharacterClass getKeyword$17$Delimiter() {
+ return keyword$17$Delimiter;
+ }
+
+ public void setKeyword$17$Delimiter(ICharacterClass characterClass) {
+ keyword$17$Delimiter = characterClass != null ? characterClass : ICharacterClass.Factory.nullClass();
+ }
+
+ public ISequenceMatcher getCrossReference$12$Delimiter() {
+ return crossReference$12$Delimiter;
+ }
+
+ public void setCrossReference$12$Delimiter(ISequenceMatcher matcher) {
+ crossReference$12$Delimiter = matcher != null ? matcher : ISequenceMatcher.Factory.nullMatcher();
+ }
+
+ public ICharacterClass getKeyword$14$Delimiter() {
+ return keyword$14$Delimiter;
+ }
+
+ public void setKeyword$14$Delimiter(ICharacterClass characterClass) {
+ keyword$14$Delimiter = characterClass != null ? characterClass : ICharacterClass.Factory.nullClass();
+ }
+
+ public ICharacterClass getKeyword$10$Delimiter() {
+ return keyword$10$Delimiter;
+ }
+
+ public void setKeyword$10$Delimiter(ICharacterClass characterClass) {
+ keyword$10$Delimiter = characterClass != null ? characterClass : ICharacterClass.Factory.nullClass();
+ }
+
+ public ICharacterClass getKeyword$6$Delimiter() {
+ return keyword$6$Delimiter;
+ }
+
+ public void setKeyword$6$Delimiter(ICharacterClass characterClass) {
+ keyword$6$Delimiter = characterClass != null ? characterClass : ICharacterClass.Factory.nullClass();
+ }
+
}
diff --git a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelFeatureConsumer.java b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelFeatureConsumer.java
index d474a00..05ac59e 100644
--- a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelFeatureConsumer.java
+++ b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelFeatureConsumer.java
@@ -11,21 +11,21 @@ import org.eclipse.xtext.parser.packrat.IMarkerFactory.IMarker;
import org.eclipse.xtext.parser.packrat.consumers.IConsumerUtility;
import org.eclipse.xtext.parser.packrat.consumers.ITerminalConsumer;
import org.eclipse.xtext.parser.packrat.consumers.NonTerminalConsumer;
+import org.eclipse.xtext.parser.packrat.matching.ICharacterClass;
+import org.eclipse.xtext.parser.packrat.matching.ISequenceMatcher;
import org.eclipse.xtext.parser.packrat.tokens.IParsedTokenAcceptor;
import org.eclipse.xtext.example.services.DomainmodelGrammarAccess;
import org.eclipse.xtext.example.services.DomainmodelGrammarAccess.FeatureElements;
-import org.eclipse.xtext.example.parser.packrat.DomainmodelDelimiters;
-
-import org.eclipse.xtext.example.parser.packrat.consumers.DomainmodelStructuralFeatureConsumer;
import org.eclipse.xtext.example.parser.packrat.consumers.DomainmodelOperationConsumer;
+import org.eclipse.xtext.example.parser.packrat.consumers.DomainmodelStructuralFeatureConsumer;
@SuppressWarnings("unused")
public final class DomainmodelFeatureConsumer extends NonTerminalConsumer {
- private DomainmodelStructuralFeatureConsumer structuralFeatureConsumer;
private DomainmodelOperationConsumer operationConsumer;
+ private DomainmodelStructuralFeatureConsumer structuralFeatureConsumer;
public DomainmodelFeatureConsumer(ICharSequenceWithOffset input, IMarkerFactory markerFactory,
IParsedTokenAcceptor tokenAcceptor, IHiddenTokenHandler hiddenTokenHandler, IConsumerUtility consumerUtil,
@@ -66,12 +66,12 @@ public final class DomainmodelFeatureConsumer extends NonTerminalConsumer {
return "Feature";
}
- public void setStructuralFeatureConsumer(DomainmodelStructuralFeatureConsumer structuralFeatureConsumer) {
- this.structuralFeatureConsumer = structuralFeatureConsumer;
- }
-
public void setOperationConsumer(DomainmodelOperationConsumer operationConsumer) {
this.operationConsumer = operationConsumer;
}
+ public void setStructuralFeatureConsumer(DomainmodelStructuralFeatureConsumer structuralFeatureConsumer) {
+ this.structuralFeatureConsumer = structuralFeatureConsumer;
+ }
+
}
diff --git a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelFileConsumer.java b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelFileConsumer.java
index 71cad3d..7ab0ad8 100644
--- a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelFileConsumer.java
+++ b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelFileConsumer.java
@@ -11,13 +11,13 @@ import org.eclipse.xtext.parser.packrat.IMarkerFactory.IMarker;
import org.eclipse.xtext.parser.packrat.consumers.IConsumerUtility;
import org.eclipse.xtext.parser.packrat.consumers.ITerminalConsumer;
import org.eclipse.xtext.parser.packrat.consumers.NonTerminalConsumer;
+import org.eclipse.xtext.parser.packrat.matching.ICharacterClass;
+import org.eclipse.xtext.parser.packrat.matching.ISequenceMatcher;
import org.eclipse.xtext.parser.packrat.tokens.IParsedTokenAcceptor;
import org.eclipse.xtext.example.services.DomainmodelGrammarAccess;
import org.eclipse.xtext.example.services.DomainmodelGrammarAccess.FileElements;
-import org.eclipse.xtext.example.parser.packrat.DomainmodelDelimiters;
-
import org.eclipse.xtext.example.parser.packrat.consumers.DomainmodelImportConsumer;
import org.eclipse.xtext.example.parser.packrat.consumers.DomainmodelNamedElementConsumer;
diff --git a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelImportConsumer.java b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelImportConsumer.java
index 822e2d5..8aa1c72 100644
--- a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelImportConsumer.java
+++ b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelImportConsumer.java
@@ -11,13 +11,13 @@ import org.eclipse.xtext.parser.packrat.IMarkerFactory.IMarker;
import org.eclipse.xtext.parser.packrat.consumers.IConsumerUtility;
import org.eclipse.xtext.parser.packrat.consumers.ITerminalConsumer;
import org.eclipse.xtext.parser.packrat.consumers.NonTerminalConsumer;
+import org.eclipse.xtext.parser.packrat.matching.ICharacterClass;
+import org.eclipse.xtext.parser.packrat.matching.ISequenceMatcher;
import org.eclipse.xtext.parser.packrat.tokens.IParsedTokenAcceptor;
import org.eclipse.xtext.example.services.DomainmodelGrammarAccess;
import org.eclipse.xtext.example.services.DomainmodelGrammarAccess.ImportElements;
-import org.eclipse.xtext.example.parser.packrat.DomainmodelDelimiters;
-
import org.eclipse.xtext.builtin.parser.packrat.consumers.XtextBuiltinSTRINGConsumer;
@SuppressWarnings("unused")
@@ -25,10 +25,16 @@ public final class DomainmodelImportConsumer extends NonTerminalConsumer {
private XtextBuiltinSTRINGConsumer stringConsumer;
+ private ICharacterClass keyword$2$Delimiter;
+
+ private ISequenceMatcher ruleCall$4$Delimiter;
+
public DomainmodelImportConsumer(ICharSequenceWithOffset input, IMarkerFactory markerFactory,
IParsedTokenAcceptor tokenAcceptor, IHiddenTokenHandler hiddenTokenHandler, IConsumerUtility consumerUtil,
ITerminalConsumer[] hiddenTokens) {
super(input, markerFactory, tokenAcceptor, hiddenTokenHandler, consumerUtil, hiddenTokens);
+ keyword$2$Delimiter = ICharacterClass.Factory.nullClass();
+ ruleCall$4$Delimiter = ISequenceMatcher.Factory.nullMatcher();
}
protected boolean doConsume() throws Exception {
@@ -49,11 +55,11 @@ public final class DomainmodelImportConsumer extends NonTerminalConsumer {
}
protected boolean consumeKeyword$2() throws Exception {
- return consumeKeyword(getRule().ele0KeywordImport(), null, false, false, DomainmodelDelimiters.ID_DELIMITER);
+ return consumeKeyword(getRule().ele0KeywordImport(), null, false, false, getKeyword$2$Delimiter());
}
protected boolean consumeAssignment$3() throws Exception {
- if (consumeTerminal(stringConsumer, "importURI", false, false, getRule().ele10LexerRuleCallSTRING(), DomainmodelDelimiters.ALL_KEYWORDS))
+ if (consumeTerminal(stringConsumer, "importURI", false, false, getRule().ele10LexerRuleCallSTRING(), getRuleCall$4$Delimiter()))
return true;
return false;
}
@@ -75,4 +81,20 @@ public final class DomainmodelImportConsumer extends NonTerminalConsumer {
this.stringConsumer = stringConsumer;
}
+ public ICharacterClass getKeyword$2$Delimiter() {
+ return keyword$2$Delimiter;
+ }
+
+ public void setKeyword$2$Delimiter(ICharacterClass characterClass) {
+ keyword$2$Delimiter = characterClass != null ? characterClass : ICharacterClass.Factory.nullClass();
+ }
+
+ public ISequenceMatcher getRuleCall$4$Delimiter() {
+ return ruleCall$4$Delimiter;
+ }
+
+ public void setRuleCall$4$Delimiter(ISequenceMatcher matcher) {
+ ruleCall$4$Delimiter = matcher != null ? matcher : ISequenceMatcher.Factory.nullMatcher();
+ }
+
}
diff --git a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelNamedElementConsumer.java b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelNamedElementConsumer.java
index 0e65c2b..e84b271 100644
--- a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelNamedElementConsumer.java
+++ b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelNamedElementConsumer.java
@@ -11,13 +11,13 @@ import org.eclipse.xtext.parser.packrat.IMarkerFactory.IMarker;
import org.eclipse.xtext.parser.packrat.consumers.IConsumerUtility;
import org.eclipse.xtext.parser.packrat.consumers.ITerminalConsumer;
import org.eclipse.xtext.parser.packrat.consumers.NonTerminalConsumer;
+import org.eclipse.xtext.parser.packrat.matching.ICharacterClass;
+import org.eclipse.xtext.parser.packrat.matching.ISequenceMatcher;
import org.eclipse.xtext.parser.packrat.tokens.IParsedTokenAcceptor;
import org.eclipse.xtext.example.services.DomainmodelGrammarAccess;
import org.eclipse.xtext.example.services.DomainmodelGrammarAccess.NamedElementElements;
-import org.eclipse.xtext.example.parser.packrat.DomainmodelDelimiters;
-
import org.eclipse.xtext.example.parser.packrat.consumers.DomainmodelPackageConsumer;
import org.eclipse.xtext.example.parser.packrat.consumers.DomainmodelTypeConsumer;
diff --git a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelOperationConsumer.java b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelOperationConsumer.java
index 16c85f5..4361457 100644
--- a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelOperationConsumer.java
+++ b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelOperationConsumer.java
@@ -11,28 +11,46 @@ import org.eclipse.xtext.parser.packrat.IMarkerFactory.IMarker;
import org.eclipse.xtext.parser.packrat.consumers.IConsumerUtility;
import org.eclipse.xtext.parser.packrat.consumers.ITerminalConsumer;
import org.eclipse.xtext.parser.packrat.consumers.NonTerminalConsumer;
+import org.eclipse.xtext.parser.packrat.matching.ICharacterClass;
+import org.eclipse.xtext.parser.packrat.matching.ISequenceMatcher;
import org.eclipse.xtext.parser.packrat.tokens.IParsedTokenAcceptor;
import org.eclipse.xtext.example.services.DomainmodelGrammarAccess;
import org.eclipse.xtext.example.services.DomainmodelGrammarAccess.OperationElements;
-import org.eclipse.xtext.example.parser.packrat.DomainmodelDelimiters;
-
-import org.eclipse.xtext.example.parser.packrat.consumers.DomainmodelParameterConsumer;
import org.eclipse.xtext.builtin.parser.packrat.consumers.XtextBuiltinIDConsumer;
+import org.eclipse.xtext.example.parser.packrat.consumers.DomainmodelParameterConsumer;
import org.eclipse.xtext.example.parser.packrat.consumers.DomainmodelTypeRefConsumer;
@SuppressWarnings("unused")
public final class DomainmodelOperationConsumer extends NonTerminalConsumer {
- private DomainmodelParameterConsumer parameterConsumer;
private XtextBuiltinIDConsumer idConsumer;
+ private DomainmodelParameterConsumer parameterConsumer;
private DomainmodelTypeRefConsumer typeRefConsumer;
+ private ISequenceMatcher ruleCall$9$Delimiter;
+
+ private ICharacterClass keyword$18$Delimiter;
+
+ private ICharacterClass keyword$10$Delimiter;
+
+ private ICharacterClass keyword$15$Delimiter;
+
+ private ICharacterClass keyword$7$Delimiter;
+
+ private ICharacterClass keyword$19$Delimiter;
+
public DomainmodelOperationConsumer(ICharSequenceWithOffset input, IMarkerFactory markerFactory,
IParsedTokenAcceptor tokenAcceptor, IHiddenTokenHandler hiddenTokenHandler, IConsumerUtility consumerUtil,
ITerminalConsumer[] hiddenTokens) {
super(input, markerFactory, tokenAcceptor, hiddenTokenHandler, consumerUtil, hiddenTokens);
+ ruleCall$9$Delimiter = ISequenceMatcher.Factory.nullMatcher();
+ keyword$18$Delimiter = ICharacterClass.Factory.nullClass();
+ keyword$10$Delimiter = ICharacterClass.Factory.nullClass();
+ keyword$15$Delimiter = ICharacterClass.Factory.nullClass();
+ keyword$7$Delimiter = ICharacterClass.Factory.nullClass();
+ keyword$19$Delimiter = ICharacterClass.Factory.nullClass();
}
protected boolean doConsume() throws Exception {
@@ -73,17 +91,17 @@ public final class DomainmodelOperationConsumer extends NonTerminalConsumer {
}
protected boolean consumeKeyword$7() throws Exception {
- return consumeKeyword(getRule().ele000000KeywordOp(), null, false, false, DomainmodelDelimiters.ID_DELIMITER);
+ return consumeKeyword(getRule().ele000000KeywordOp(), null, false, false, getKeyword$7$Delimiter());
}
protected boolean consumeAssignment$8() throws Exception {
- if (consumeTerminal(idConsumer, "name", false, false, getRule().ele0000010LexerRuleCallID(), DomainmodelDelimiters.ALL_KEYWORDS))
+ if (consumeTerminal(idConsumer, "name", false, false, getRule().ele0000010LexerRuleCallID(), getRuleCall$9$Delimiter()))
return true;
return false;
}
protected boolean consumeKeyword$10() throws Exception {
- return consumeKeyword(getRule().ele00001KeywordLeftParenthesis(), null, false, false, DomainmodelDelimiters.ANY_OTHER_DELIMITER);
+ return consumeKeyword(getRule().ele00001KeywordLeftParenthesis(), null, false, false, getKeyword$10$Delimiter());
}
protected boolean consumeGroup$11() throws Exception {
@@ -129,7 +147,7 @@ public final class DomainmodelOperationConsumer extends NonTerminalConsumer {
}
protected boolean consumeKeyword$15() throws Exception {
- return consumeKeyword(getRule().ele000110KeywordComma(), null, false, false, DomainmodelDelimiters.ANY_OTHER_DELIMITER);
+ return consumeKeyword(getRule().ele000110KeywordComma(), null, false, false, getKeyword$15$Delimiter());
}
protected boolean consumeAssignment$16() throws Exception {
@@ -139,11 +157,11 @@ public final class DomainmodelOperationConsumer extends NonTerminalConsumer {
}
protected boolean consumeKeyword$18() throws Exception {
- return consumeKeyword(getRule().ele001KeywordRightParenthesis(), null, false, false, DomainmodelDelimiters.ANY_OTHER_DELIMITER);
+ return consumeKeyword(getRule().ele001KeywordRightParenthesis(), null, false, false, getKeyword$18$Delimiter());
}
protected boolean consumeKeyword$19() throws Exception {
- return consumeKeyword(getRule().ele01KeywordColon(), null, false, false, DomainmodelDelimiters.ANY_OTHER_DELIMITER);
+ return consumeKeyword(getRule().ele01KeywordColon(), null, false, false, getKeyword$19$Delimiter());
}
protected boolean consumeAssignment$20() throws Exception {
@@ -165,16 +183,64 @@ public final class DomainmodelOperationConsumer extends NonTerminalConsumer {
return "Operation";
}
- public void setParameterConsumer(DomainmodelParameterConsumer parameterConsumer) {
- this.parameterConsumer = parameterConsumer;
- }
-
public void setIdConsumer(XtextBuiltinIDConsumer idConsumer) {
this.idConsumer = idConsumer;
}
+ public void setParameterConsumer(DomainmodelParameterConsumer parameterConsumer) {
+ this.parameterConsumer = parameterConsumer;
+ }
+
public void setTypeRefConsumer(DomainmodelTypeRefConsumer typeRefConsumer) {
this.typeRefConsumer = typeRefConsumer;
}
+ public ISequenceMatcher getRuleCall$9$Delimiter() {
+ return ruleCall$9$Delimiter;
+ }
+
+ public void setRuleCall$9$Delimiter(ISequenceMatcher matcher) {
+ ruleCall$9$Delimiter = matcher != null ? matcher : ISequenceMatcher.Factory.nullMatcher();
+ }
+
+ public ICharacterClass getKeyword$18$Delimiter() {
+ return keyword$18$Delimiter;
+ }
+
+ public void setKeyword$18$Delimiter(ICharacterClass characterClass) {
+ keyword$18$Delimiter = characterClass != null ? characterClass : ICharacterClass.Factory.nullClass();
+ }
+
+ public ICharacterClass getKeyword$10$Delimiter() {
+ return keyword$10$Delimiter;
+ }
+
+ public void setKeyword$10$Delimiter(ICharacterClass characterClass) {
+ keyword$10$Delimiter = characterClass != null ? characterClass : ICharacterClass.Factory.nullClass();
+ }
+
+ public ICharacterClass getKeyword$15$Delimiter() {
+ return keyword$15$Delimiter;
+ }
+
+ public void setKeyword$15$Delimiter(ICharacterClass characterClass) {
+ keyword$15$Delimiter = characterClass != null ? characterClass : ICharacterClass.Factory.nullClass();
+ }
+
+ public ICharacterClass getKeyword$7$Delimiter() {
+ return keyword$7$Delimiter;
+ }
+
+ public void setKeyword$7$Delimiter(ICharacterClass characterClass) {
+ keyword$7$Delimiter = characterClass != null ? characterClass : ICharacterClass.Factory.nullClass();
+ }
+
+ public ICharacterClass getKeyword$19$Delimiter() {
+ return keyword$19$Delimiter;
+ }
+
+ public void setKeyword$19$Delimiter(ICharacterClass characterClass) {
+ keyword$19$Delimiter = characterClass != null ? characterClass : ICharacterClass.Factory.nullClass();
+ }
+
}
diff --git a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelPackageConsumer.java b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelPackageConsumer.java
index f7c4f10..b278066 100644
--- a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelPackageConsumer.java
+++ b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelPackageConsumer.java
@@ -11,26 +11,35 @@ import org.eclipse.xtext.parser.packrat.IMarkerFactory.IMarker;
import org.eclipse.xtext.parser.packrat.consumers.IConsumerUtility;
import org.eclipse.xtext.parser.packrat.consumers.ITerminalConsumer;
import org.eclipse.xtext.parser.packrat.consumers.NonTerminalConsumer;
+import org.eclipse.xtext.parser.packrat.matching.ICharacterClass;
+import org.eclipse.xtext.parser.packrat.matching.ISequenceMatcher;
import org.eclipse.xtext.parser.packrat.tokens.IParsedTokenAcceptor;
import org.eclipse.xtext.example.services.DomainmodelGrammarAccess;
import org.eclipse.xtext.example.services.DomainmodelGrammarAccess.PackageElements;
-import org.eclipse.xtext.example.parser.packrat.DomainmodelDelimiters;
-
-import org.eclipse.xtext.example.parser.packrat.consumers.DomainmodelQualifiedNameConsumer;
import org.eclipse.xtext.example.parser.packrat.consumers.DomainmodelNamedElementConsumer;
+import org.eclipse.xtext.example.parser.packrat.consumers.DomainmodelQualifiedNameConsumer;
@SuppressWarnings("unused")
public final class DomainmodelPackageConsumer extends NonTerminalConsumer {
- private DomainmodelQualifiedNameConsumer qualifiedNameConsumer;
private DomainmodelNamedElementConsumer namedElementConsumer;
+ private DomainmodelQualifiedNameConsumer qualifiedNameConsumer;
+ private ICharacterClass keyword$8$Delimiter;
+
+ private ICharacterClass keyword$11$Delimiter;
+
+ private ICharacterClass keyword$5$Delimiter;
+
public DomainmodelPackageConsumer(ICharSequenceWithOffset input, IMarkerFactory markerFactory,
IParsedTokenAcceptor tokenAcceptor, IHiddenTokenHandler hiddenTokenHandler, IConsumerUtility consumerUtil,
ITerminalConsumer[] hiddenTokens) {
super(input, markerFactory, tokenAcceptor, hiddenTokenHandler, consumerUtil, hiddenTokens);
+ keyword$8$Delimiter = ICharacterClass.Factory.nullClass();
+ keyword$11$Delimiter = ICharacterClass.Factory.nullClass();
+ keyword$5$Delimiter = ICharacterClass.Factory.nullClass();
}
protected boolean doConsume() throws Exception {
@@ -63,7 +72,7 @@ public final class DomainmodelPackageConsumer extends NonTerminalConsumer {
}
protected boolean consumeKeyword$5() throws Exception {
- return consumeKeyword(getRule().ele0000KeywordPackage(), null, false, false, DomainmodelDelimiters.ID_DELIMITER);
+ return consumeKeyword(getRule().ele0000KeywordPackage(), null, false, false, getKeyword$5$Delimiter());
}
protected boolean consumeAssignment$6() throws Exception {
@@ -73,7 +82,7 @@ public final class DomainmodelPackageConsumer extends NonTerminalConsumer {
}
protected boolean consumeKeyword$8() throws Exception {
- return consumeKeyword(getRule().ele001KeywordLeftCurlyBracket(), null, false, false, DomainmodelDelimiters.ANY_OTHER_DELIMITER);
+ return consumeKeyword(getRule().ele001KeywordLeftCurlyBracket(), null, false, false, getKeyword$8$Delimiter());
}
protected boolean consumeAssignment$9() throws Exception {
@@ -88,7 +97,7 @@ public final class DomainmodelPackageConsumer extends NonTerminalConsumer {
}
protected boolean consumeKeyword$11() throws Exception {
- return consumeKeyword(getRule().ele1KeywordRightCurlyBracket(), null, false, false, DomainmodelDelimiters.ANY_OTHER_DELIMITER);
+ return consumeKeyword(getRule().ele1KeywordRightCurlyBracket(), null, false, false, getKeyword$11$Delimiter());
}
public PackageElements getRule() {
@@ -104,12 +113,36 @@ public final class DomainmodelPackageConsumer extends NonTerminalConsumer {
return "Package";
}
+ public void setNamedElementConsumer(DomainmodelNamedElementConsumer namedElementConsumer) {
+ this.namedElementConsumer = namedElementConsumer;
+ }
+
public void setQualifiedNameConsumer(DomainmodelQualifiedNameConsumer qualifiedNameConsumer) {
this.qualifiedNameConsumer = qualifiedNameConsumer;
}
- public void setNamedElementConsumer(DomainmodelNamedElementConsumer namedElementConsumer) {
- this.namedElementConsumer = namedElementConsumer;
+ public ICharacterClass getKeyword$8$Delimiter() {
+ return keyword$8$Delimiter;
+ }
+
+ public void setKeyword$8$Delimiter(ICharacterClass characterClass) {
+ keyword$8$Delimiter = characterClass != null ? characterClass : ICharacterClass.Factory.nullClass();
+ }
+
+ public ICharacterClass getKeyword$11$Delimiter() {
+ return keyword$11$Delimiter;
+ }
+
+ public void setKeyword$11$Delimiter(ICharacterClass characterClass) {
+ keyword$11$Delimiter = characterClass != null ? characterClass : ICharacterClass.Factory.nullClass();
+ }
+
+ public ICharacterClass getKeyword$5$Delimiter() {
+ return keyword$5$Delimiter;
+ }
+
+ public void setKeyword$5$Delimiter(ICharacterClass characterClass) {
+ keyword$5$Delimiter = characterClass != null ? characterClass : ICharacterClass.Factory.nullClass();
}
}
diff --git a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelParameterConsumer.java b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelParameterConsumer.java
index 9271e69..6e71fe5 100644
--- a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelParameterConsumer.java
+++ b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelParameterConsumer.java
@@ -11,13 +11,13 @@ import org.eclipse.xtext.parser.packrat.IMarkerFactory.IMarker;
import org.eclipse.xtext.parser.packrat.consumers.IConsumerUtility;
import org.eclipse.xtext.parser.packrat.consumers.ITerminalConsumer;
import org.eclipse.xtext.parser.packrat.consumers.NonTerminalConsumer;
+import org.eclipse.xtext.parser.packrat.matching.ICharacterClass;
+import org.eclipse.xtext.parser.packrat.matching.ISequenceMatcher;
import org.eclipse.xtext.parser.packrat.tokens.IParsedTokenAcceptor;
import org.eclipse.xtext.example.services.DomainmodelGrammarAccess;
import org.eclipse.xtext.example.services.DomainmodelGrammarAccess.ParameterElements;
-import org.eclipse.xtext.example.parser.packrat.DomainmodelDelimiters;
-
import org.eclipse.xtext.builtin.parser.packrat.consumers.XtextBuiltinIDConsumer;
import org.eclipse.xtext.example.parser.packrat.consumers.DomainmodelTypeRefConsumer;
@@ -27,10 +27,13 @@ public final class DomainmodelParameterConsumer extends NonTerminalConsumer {
private XtextBuiltinIDConsumer idConsumer;
private DomainmodelTypeRefConsumer typeRefConsumer;
+ private ISequenceMatcher ruleCall$3$Delimiter;
+
public DomainmodelParameterConsumer(ICharSequenceWithOffset input, IMarkerFactory markerFactory,
IParsedTokenAcceptor tokenAcceptor, IHiddenTokenHandler hiddenTokenHandler, IConsumerUtility consumerUtil,
ITerminalConsumer[] hiddenTokens) {
super(input, markerFactory, tokenAcceptor, hiddenTokenHandler, consumerUtil, hiddenTokens);
+ ruleCall$3$Delimiter = ISequenceMatcher.Factory.nullMatcher();
}
protected boolean doConsume() throws Exception {
@@ -51,7 +54,7 @@ public final class DomainmodelParameterConsumer extends NonTerminalConsumer {
}
protected boolean consumeAssignment$2() throws Exception {
- if (consumeTerminal(idConsumer, "name", false, false, getRule().ele00LexerRuleCallID(), DomainmodelDelimiters.ALL_KEYWORDS))
+ if (consumeTerminal(idConsumer, "name", false, false, getRule().ele00LexerRuleCallID(), getRuleCall$3$Delimiter()))
return true;
return false;
}
@@ -83,4 +86,12 @@ public final class DomainmodelParameterConsumer extends NonTerminalConsumer {
this.typeRefConsumer = typeRefConsumer;
}
+ public ISequenceMatcher getRuleCall$3$Delimiter() {
+ return ruleCall$3$Delimiter;
+ }
+
+ public void setRuleCall$3$Delimiter(ISequenceMatcher matcher) {
+ ruleCall$3$Delimiter = matcher != null ? matcher : ISequenceMatcher.Factory.nullMatcher();
+ }
+
}
diff --git a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelQualifiedNameConsumer.java b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelQualifiedNameConsumer.java
index de3e595..64a5160 100644
--- a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelQualifiedNameConsumer.java
+++ b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelQualifiedNameConsumer.java
@@ -11,13 +11,13 @@ import org.eclipse.xtext.parser.packrat.IMarkerFactory.IMarker;
import org.eclipse.xtext.parser.packrat.consumers.IConsumerUtility;
import org.eclipse.xtext.parser.packrat.consumers.ITerminalConsumer;
import org.eclipse.xtext.parser.packrat.consumers.NonTerminalConsumer;
+import org.eclipse.xtext.parser.packrat.matching.ICharacterClass;
+import org.eclipse.xtext.parser.packrat.matching.ISequenceMatcher;
import org.eclipse.xtext.parser.packrat.tokens.IParsedTokenAcceptor;
import org.eclipse.xtext.example.services.DomainmodelGrammarAccess;
import org.eclipse.xtext.example.services.DomainmodelGrammarAccess.QualifiedNameElements;
-import org.eclipse.xtext.example.parser.packrat.DomainmodelDelimiters;
-
import org.eclipse.xtext.builtin.parser.packrat.consumers.XtextBuiltinIDConsumer;
@SuppressWarnings("unused")
@@ -25,10 +25,19 @@ public final class DomainmodelQualifiedNameConsumer extends NonTerminalConsumer
private XtextBuiltinIDConsumer idConsumer;
+ private ICharacterClass keyword$4$Delimiter;
+
+ private ISequenceMatcher ruleCall$5$Delimiter;
+
+ private ISequenceMatcher ruleCall$2$Delimiter;
+
public DomainmodelQualifiedNameConsumer(ICharSequenceWithOffset input, IMarkerFactory markerFactory,
IParsedTokenAcceptor tokenAcceptor, IHiddenTokenHandler hiddenTokenHandler, IConsumerUtility consumerUtil,
ITerminalConsumer[] hiddenTokens) {
super(input, markerFactory, tokenAcceptor, hiddenTokenHandler, consumerUtil, hiddenTokens);
+ keyword$4$Delimiter = ICharacterClass.Factory.nullClass();
+ ruleCall$5$Delimiter = ISequenceMatcher.Factory.nullMatcher();
+ ruleCall$2$Delimiter = ISequenceMatcher.Factory.nullMatcher();
}
protected boolean doConsume() throws Exception {
@@ -49,7 +58,7 @@ public final class DomainmodelQualifiedNameConsumer extends NonTerminalConsumer
}
protected boolean consumeRuleCall$2() throws Exception {
- return consumeTerminal(idConsumer, null, false, false, getRule().ele0LexerRuleCallID(), DomainmodelDelimiters.ALL_KEYWORDS);
+ return consumeTerminal(idConsumer, null, false, false, getRule().ele0LexerRuleCallID(), getRuleCall$2$Delimiter());
}
protected boolean consumeGroup$3() throws Exception {
@@ -71,11 +80,11 @@ public final class DomainmodelQualifiedNameConsumer extends NonTerminalConsumer
}
protected boolean consumeKeyword$4() throws Exception {
- return consumeKeyword(getRule().ele10KeywordFullStop(), null, false, false, DomainmodelDelimiters.ANY_OTHER_DELIMITER);
+ return consumeKeyword(getRule().ele10KeywordFullStop(), null, false, false, getKeyword$4$Delimiter());
}
protected boolean consumeRuleCall$5() throws Exception {
- return consumeTerminal(idConsumer, null, false, false, getRule().ele11LexerRuleCallID(), DomainmodelDelimiters.ALL_KEYWORDS);
+ return consumeTerminal(idConsumer, null, false, false, getRule().ele11LexerRuleCallID(), getRuleCall$5$Delimiter());
}
public QualifiedNameElements getRule() {
@@ -95,4 +104,28 @@ public final class DomainmodelQualifiedNameConsumer extends NonTerminalConsumer
this.idConsumer = idConsumer;
}
+ public ICharacterClass getKeyword$4$Delimiter() {
+ return keyword$4$Delimiter;
+ }
+
+ public void setKeyword$4$Delimiter(ICharacterClass characterClass) {
+ keyword$4$Delimiter = characterClass != null ? characterClass : ICharacterClass.Factory.nullClass();
+ }
+
+ public ISequenceMatcher getRuleCall$5$Delimiter() {
+ return ruleCall$5$Delimiter;
+ }
+
+ public void setRuleCall$5$Delimiter(ISequenceMatcher matcher) {
+ ruleCall$5$Delimiter = matcher != null ? matcher : ISequenceMatcher.Factory.nullMatcher();
+ }
+
+ public ISequenceMatcher getRuleCall$2$Delimiter() {
+ return ruleCall$2$Delimiter;
+ }
+
+ public void setRuleCall$2$Delimiter(ISequenceMatcher matcher) {
+ ruleCall$2$Delimiter = matcher != null ? matcher : ISequenceMatcher.Factory.nullMatcher();
+ }
+
}
diff --git a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelReferenceConsumer.java b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelReferenceConsumer.java
index 110ee81..525fd51 100644
--- a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelReferenceConsumer.java
+++ b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelReferenceConsumer.java
@@ -11,13 +11,13 @@ import org.eclipse.xtext.parser.packrat.IMarkerFactory.IMarker;
import org.eclipse.xtext.parser.packrat.consumers.IConsumerUtility;
import org.eclipse.xtext.parser.packrat.consumers.ITerminalConsumer;
import org.eclipse.xtext.parser.packrat.consumers.NonTerminalConsumer;
+import org.eclipse.xtext.parser.packrat.matching.ICharacterClass;
+import org.eclipse.xtext.parser.packrat.matching.ISequenceMatcher;
import org.eclipse.xtext.parser.packrat.tokens.IParsedTokenAcceptor;
import org.eclipse.xtext.example.services.DomainmodelGrammarAccess;
import org.eclipse.xtext.example.services.DomainmodelGrammarAccess.ReferenceElements;
-import org.eclipse.xtext.example.parser.packrat.DomainmodelDelimiters;
-
import org.eclipse.xtext.builtin.parser.packrat.consumers.XtextBuiltinIDConsumer;
import org.eclipse.xtext.example.parser.packrat.consumers.DomainmodelTypeRefConsumer;
@@ -27,10 +27,25 @@ public final class DomainmodelReferenceConsumer extends NonTerminalConsumer {
private XtextBuiltinIDConsumer idConsumer;
private DomainmodelTypeRefConsumer typeRefConsumer;
+ private ICharacterClass keyword$12$Delimiter;
+
+ private ISequenceMatcher ruleCall$7$Delimiter;
+
+ private ICharacterClass keyword$8$Delimiter;
+
+ private ISequenceMatcher crossReference$14$Delimiter;
+
+ private ICharacterClass keyword$5$Delimiter;
+
public DomainmodelReferenceConsumer(ICharSequenceWithOffset input, IMarkerFactory markerFactory,
IParsedTokenAcceptor tokenAcceptor, IHiddenTokenHandler hiddenTokenHandler, IConsumerUtility consumerUtil,
ITerminalConsumer[] hiddenTokens) {
super(input, markerFactory, tokenAcceptor, hiddenTokenHandler, consumerUtil, hiddenTokens);
+ keyword$12$Delimiter = ICharacterClass.Factory.nullClass();
+ ruleCall$7$Delimiter = ISequenceMatcher.Factory.nullMatcher();
+ keyword$8$Delimiter = ICharacterClass.Factory.nullClass();
+ crossReference$14$Delimiter = ISequenceMatcher.Factory.nullMatcher();
+ keyword$5$Delimiter = ICharacterClass.Factory.nullClass();
}
protected boolean doConsume() throws Exception {
@@ -63,17 +78,17 @@ public final class DomainmodelReferenceConsumer extends NonTerminalConsumer {
}
protected boolean consumeKeyword$5() throws Exception {
- return consumeKeyword(getRule().ele0000KeywordRef(), null, false, false, DomainmodelDelimiters.ID_DELIMITER);
+ return consumeKeyword(getRule().ele0000KeywordRef(), null, false, false, getKeyword$5$Delimiter());
}
protected boolean consumeAssignment$6() throws Exception {
- if (consumeTerminal(idConsumer, "name", false, false, getRule().ele00010LexerRuleCallID(), DomainmodelDelimiters.ALL_KEYWORDS))
+ if (consumeTerminal(idConsumer, "name", false, false, getRule().ele00010LexerRuleCallID(), getRuleCall$7$Delimiter()))
return true;
return false;
}
protected boolean consumeKeyword$8() throws Exception {
- return consumeKeyword(getRule().ele001KeywordColon(), null, false, false, DomainmodelDelimiters.ANY_OTHER_DELIMITER);
+ return consumeKeyword(getRule().ele001KeywordColon(), null, false, false, getKeyword$8$Delimiter());
}
protected boolean consumeAssignment$9() throws Exception {
@@ -101,11 +116,11 @@ public final class DomainmodelReferenceConsumer extends NonTerminalConsumer {
}
protected boolean consumeKeyword$12() throws Exception {
- return consumeKeyword(getRule().ele10KeywordOpposite(), null, false, false, DomainmodelDelimiters.ID_DELIMITER);
+ return consumeKeyword(getRule().ele10KeywordOpposite(), null, false, false, getKeyword$12$Delimiter());
}
protected boolean consumeAssignment$13() throws Exception {
- if (consumeTerminal(idConsumer, null, false, false, getRule().ele110CrossReferenceEStringReference(), DomainmodelDelimiters.ALL_KEYWORDS))
+ if (consumeTerminal(idConsumer, null, false, false, getRule().ele110CrossReferenceEStringReference(), getCrossReference$14$Delimiter()))
return true;
return false;
}
@@ -131,4 +146,44 @@ public final class DomainmodelReferenceConsumer extends NonTerminalConsumer {
this.typeRefConsumer = typeRefConsumer;
}
+ public ICharacterClass getKeyword$12$Delimiter() {
+ return keyword$12$Delimiter;
+ }
+
+ public void setKeyword$12$Delimiter(ICharacterClass characterClass) {
+ keyword$12$Delimiter = characterClass != null ? characterClass : ICharacterClass.Factory.nullClass();
+ }
+
+ public ISequenceMatcher getRuleCall$7$Delimiter() {
+ return ruleCall$7$Delimiter;
+ }
+
+ public void setRuleCall$7$Delimiter(ISequenceMatcher matcher) {
+ ruleCall$7$Delimiter = matcher != null ? matcher : ISequenceMatcher.Factory.nullMatcher();
+ }
+
+ public ICharacterClass getKeyword$8$Delimiter() {
+ return keyword$8$Delimiter;
+ }
+
+ public void setKeyword$8$Delimiter(ICharacterClass characterClass) {
+ keyword$8$Delimiter = characterClass != null ? characterClass : ICharacterClass.Factory.nullClass();
+ }
+
+ public ISequenceMatcher getCrossReference$14$Delimiter() {
+ return crossReference$14$Delimiter;
+ }
+
+ public void setCrossReference$14$Delimiter(ISequenceMatcher matcher) {
+ crossReference$14$Delimiter = matcher != null ? matcher : ISequenceMatcher.Factory.nullMatcher();
+ }
+
+ public ICharacterClass getKeyword$5$Delimiter() {
+ return keyword$5$Delimiter;
+ }
+
+ public void setKeyword$5$Delimiter(ICharacterClass characterClass) {
+ keyword$5$Delimiter = characterClass != null ? characterClass : ICharacterClass.Factory.nullClass();
+ }
+
}
diff --git a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelStructuralFeatureConsumer.java b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelStructuralFeatureConsumer.java
index 4b15496..0324f02 100644
--- a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelStructuralFeatureConsumer.java
+++ b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelStructuralFeatureConsumer.java
@@ -11,21 +11,21 @@ import org.eclipse.xtext.parser.packrat.IMarkerFactory.IMarker;
import org.eclipse.xtext.parser.packrat.consumers.IConsumerUtility;
import org.eclipse.xtext.parser.packrat.consumers.ITerminalConsumer;
import org.eclipse.xtext.parser.packrat.consumers.NonTerminalConsumer;
+import org.eclipse.xtext.parser.packrat.matching.ICharacterClass;
+import org.eclipse.xtext.parser.packrat.matching.ISequenceMatcher;
import org.eclipse.xtext.parser.packrat.tokens.IParsedTokenAcceptor;
import org.eclipse.xtext.example.services.DomainmodelGrammarAccess;
import org.eclipse.xtext.example.services.DomainmodelGrammarAccess.StructuralFeatureElements;
-import org.eclipse.xtext.example.parser.packrat.DomainmodelDelimiters;
-
-import org.eclipse.xtext.example.parser.packrat.consumers.DomainmodelReferenceConsumer;
import org.eclipse.xtext.example.parser.packrat.consumers.DomainmodelAttributeConsumer;
+import org.eclipse.xtext.example.parser.packrat.consumers.DomainmodelReferenceConsumer;
@SuppressWarnings("unused")
public final class DomainmodelStructuralFeatureConsumer extends NonTerminalConsumer {
- private DomainmodelReferenceConsumer referenceConsumer;
private DomainmodelAttributeConsumer attributeConsumer;
+ private DomainmodelReferenceConsumer referenceConsumer;
public DomainmodelStructuralFeatureConsumer(ICharSequenceWithOffset input, IMarkerFactory markerFactory,
IParsedTokenAcceptor tokenAcceptor, IHiddenTokenHandler hiddenTokenHandler, IConsumerUtility consumerUtil,
@@ -66,12 +66,12 @@ public final class DomainmodelStructuralFeatureConsumer extends NonTerminalConsu
return "StructuralFeature";
}
- public void setReferenceConsumer(DomainmodelReferenceConsumer referenceConsumer) {
- this.referenceConsumer = referenceConsumer;
- }
-
public void setAttributeConsumer(DomainmodelAttributeConsumer attributeConsumer) {
this.attributeConsumer = attributeConsumer;
}
+ public void setReferenceConsumer(DomainmodelReferenceConsumer referenceConsumer) {
+ this.referenceConsumer = referenceConsumer;
+ }
+
}
diff --git a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelTypeConsumer.java b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelTypeConsumer.java
index 9444ff8..d6f9793 100644
--- a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelTypeConsumer.java
+++ b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelTypeConsumer.java
@@ -11,13 +11,13 @@ import org.eclipse.xtext.parser.packrat.IMarkerFactory.IMarker;
import org.eclipse.xtext.parser.packrat.consumers.IConsumerUtility;
import org.eclipse.xtext.parser.packrat.consumers.ITerminalConsumer;
import org.eclipse.xtext.parser.packrat.consumers.NonTerminalConsumer;
+import org.eclipse.xtext.parser.packrat.matching.ICharacterClass;
+import org.eclipse.xtext.parser.packrat.matching.ISequenceMatcher;
import org.eclipse.xtext.parser.packrat.tokens.IParsedTokenAcceptor;
import org.eclipse.xtext.example.services.DomainmodelGrammarAccess;
import org.eclipse.xtext.example.services.DomainmodelGrammarAccess.TypeElements;
-import org.eclipse.xtext.example.parser.packrat.DomainmodelDelimiters;
-
import org.eclipse.xtext.example.parser.packrat.consumers.DomainmodelDataTypeConsumer;
import org.eclipse.xtext.example.parser.packrat.consumers.DomainmodelEntityConsumer;
diff --git a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelTypeRefConsumer.java b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelTypeRefConsumer.java
index 793401b..4b59f8f 100644
--- a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelTypeRefConsumer.java
+++ b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelTypeRefConsumer.java
@@ -11,13 +11,13 @@ import org.eclipse.xtext.parser.packrat.IMarkerFactory.IMarker;
import org.eclipse.xtext.parser.packrat.consumers.IConsumerUtility;
import org.eclipse.xtext.parser.packrat.consumers.ITerminalConsumer;
import org.eclipse.xtext.parser.packrat.consumers.NonTerminalConsumer;
+import org.eclipse.xtext.parser.packrat.matching.ICharacterClass;
+import org.eclipse.xtext.parser.packrat.matching.ISequenceMatcher;
import org.eclipse.xtext.parser.packrat.tokens.IParsedTokenAcceptor;
import org.eclipse.xtext.example.services.DomainmodelGrammarAccess;
import org.eclipse.xtext.example.services.DomainmodelGrammarAccess.TypeRefElements;
-import org.eclipse.xtext.example.parser.packrat.DomainmodelDelimiters;
-
import org.eclipse.xtext.builtin.parser.packrat.consumers.XtextBuiltinIDConsumer;
@SuppressWarnings("unused")
@@ -25,10 +25,13 @@ public final class DomainmodelTypeRefConsumer extends NonTerminalConsumer {
private XtextBuiltinIDConsumer idConsumer;
+ private ISequenceMatcher crossReference$2$Delimiter;
+
public DomainmodelTypeRefConsumer(ICharSequenceWithOffset input, IMarkerFactory markerFactory,
IParsedTokenAcceptor tokenAcceptor, IHiddenTokenHandler hiddenTokenHandler, IConsumerUtility consumerUtil,
ITerminalConsumer[] hiddenTokens) {
super(input, markerFactory, tokenAcceptor, hiddenTokenHandler, consumerUtil, hiddenTokens);
+ crossReference$2$Delimiter = ISequenceMatcher.Factory.nullMatcher();
}
protected boolean doConsume() throws Exception {
@@ -36,7 +39,7 @@ public final class DomainmodelTypeRefConsumer extends NonTerminalConsumer {
}
protected boolean consumeAssignment$1() throws Exception {
- if (consumeTerminal(idConsumer, null, false, false, getRule().ele0CrossReferenceEStringType(), DomainmodelDelimiters.ALL_KEYWORDS))
+ if (consumeTerminal(idConsumer, null, false, false, getRule().ele0CrossReferenceEStringType(), getCrossReference$2$Delimiter()))
return true;
return false;
}
@@ -58,4 +61,12 @@ public final class DomainmodelTypeRefConsumer extends NonTerminalConsumer {
this.idConsumer = idConsumer;
}
+ public ISequenceMatcher getCrossReference$2$Delimiter() {
+ return crossReference$2$Delimiter;
+ }
+
+ public void setCrossReference$2$Delimiter(ISequenceMatcher matcher) {
+ crossReference$2$Delimiter = matcher != null ? matcher : ISequenceMatcher.Factory.nullMatcher();
+ }
+
}
diff --git a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelTypedElementConsumer.java b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelTypedElementConsumer.java
index bf726bf..7ecb244 100644
--- a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelTypedElementConsumer.java
+++ b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelTypedElementConsumer.java
@@ -11,21 +11,21 @@ import org.eclipse.xtext.parser.packrat.IMarkerFactory.IMarker;
import org.eclipse.xtext.parser.packrat.consumers.IConsumerUtility;
import org.eclipse.xtext.parser.packrat.consumers.ITerminalConsumer;
import org.eclipse.xtext.parser.packrat.consumers.NonTerminalConsumer;
+import org.eclipse.xtext.parser.packrat.matching.ICharacterClass;
+import org.eclipse.xtext.parser.packrat.matching.ISequenceMatcher;
import org.eclipse.xtext.parser.packrat.tokens.IParsedTokenAcceptor;
import org.eclipse.xtext.example.services.DomainmodelGrammarAccess;
import org.eclipse.xtext.example.services.DomainmodelGrammarAccess.TypedElementElements;
-import org.eclipse.xtext.example.parser.packrat.DomainmodelDelimiters;
-
-import org.eclipse.xtext.example.parser.packrat.consumers.DomainmodelParameterConsumer;
import org.eclipse.xtext.example.parser.packrat.consumers.DomainmodelFeatureConsumer;
+import org.eclipse.xtext.example.parser.packrat.consumers.DomainmodelParameterConsumer;
@SuppressWarnings("unused")
public final class DomainmodelTypedElementConsumer extends NonTerminalConsumer {
- private DomainmodelParameterConsumer parameterConsumer;
private DomainmodelFeatureConsumer featureConsumer;
+ private DomainmodelParameterConsumer parameterConsumer;
public DomainmodelTypedElementConsumer(ICharSequenceWithOffset input, IMarkerFactory markerFactory,
IParsedTokenAcceptor tokenAcceptor, IHiddenTokenHandler hiddenTokenHandler, IConsumerUtility consumerUtil,
@@ -66,12 +66,12 @@ public final class DomainmodelTypedElementConsumer extends NonTerminalConsumer {
return "TypedElement";
}
- public void setParameterConsumer(DomainmodelParameterConsumer parameterConsumer) {
- this.parameterConsumer = parameterConsumer;
- }
-
public void setFeatureConsumer(DomainmodelFeatureConsumer featureConsumer) {
this.featureConsumer = featureConsumer;
}
+ public void setParameterConsumer(DomainmodelParameterConsumer parameterConsumer) {
+ this.parameterConsumer = parameterConsumer;
+ }
+
}
diff --git a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/services/DomainmodelMetamodelAccess.java b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/services/DomainmodelMetamodelAccess.java
index 06b0fdd..58f904b 100644
--- a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/services/DomainmodelMetamodelAccess.java
+++ b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/services/DomainmodelMetamodelAccess.java
@@ -36,7 +36,7 @@ public class DomainmodelMetamodelAccess extends BaseEPackageAccess implements IM
}
private EPackage[] all = new EPackage[] {
- BaseEPackageAccess.getEPackageFromRegistry("http://www.eclipse.org/emf/2002/Ecore"),getDomainmodelEPackage()
+ getDomainmodelEPackage(),BaseEPackageAccess.getEPackageFromRegistry("http://www.eclipse.org/emf/2002/Ecore")
};
public EPackage[] getAllEPackages() {