| author | szarnekow | 2009-01-29 11:09:55 (EST) |
|---|---|---|
| committer | sefftinge | 2009-01-29 11:09:55 (EST) |
| commit | ea917a5ffbc40b00632ec6faa75688e173ab34fd (patch) (side-by-side diff) | |
| tree | a62e2274d197145f5d6387a614e4dd2c10517633 | |
| parent | 0f81fd017b2828504d9472bf7ea2a0b6f8eb9a97 (diff) | |
| download | org.eclipse.xtext-ea917a5ffbc40b00632ec6faa75688e173ab34fd.zip org.eclipse.xtext-ea917a5ffbc40b00632ec6faa75688e173ab34fd.tar.gz org.eclipse.xtext-ea917a5ffbc40b00632ec6faa75688e173ab34fd.tar.bz2 | |
WIP: error recovery, some preparations
327 files changed, 1265 insertions, 3187 deletions
diff --git a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/ReferenceGrammarPackratParser.java b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/ReferenceGrammarPackratParser.java index 3120b64..dd6822c 100644 --- a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/ReferenceGrammarPackratParser.java +++ b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/ReferenceGrammarPackratParser.java @@ -4,19 +4,13 @@ Generated with Xtext package org.eclipse.xtext.reference.parser.packrat; import org.eclipse.xtext.parser.packrat.AbstractPackratParser; -import org.eclipse.xtext.parser.packrat.ICharSequenceWithOffset; -import org.eclipse.xtext.parser.packrat.IHiddenTokenHandler; -import org.eclipse.xtext.parser.packrat.IMarkerFactory; -import org.eclipse.xtext.parser.packrat.consumers.IConsumerUtility; -import org.eclipse.xtext.parser.packrat.tokens.IParsedTokenAcceptor; +import org.eclipse.xtext.parser.packrat.AbstractParserConfiguration.IInternalParserConfiguration; public class ReferenceGrammarPackratParser extends AbstractPackratParser { @Override - protected ReferenceGrammarParserConfiguration createParserConfiguration(ICharSequenceWithOffset input, - IMarkerFactory markerFactory, IParsedTokenAcceptor tokenAcceptor, IHiddenTokenHandler hiddenTokenHandler, - IConsumerUtility consumerUtil) { - return new ReferenceGrammarParserConfiguration(input, markerFactory, tokenAcceptor, hiddenTokenHandler, consumerUtil); + protected ReferenceGrammarParserConfiguration createParserConfiguration(IInternalParserConfiguration configuration) { + return new ReferenceGrammarParserConfiguration(configuration); } } diff --git a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/ReferenceGrammarParserConfiguration.java b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/ReferenceGrammarParserConfiguration.java index 70fe967..acb97a5 100644 --- a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/ReferenceGrammarParserConfiguration.java +++ b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/ReferenceGrammarParserConfiguration.java @@ -4,13 +4,7 @@ Generated with Xtext package org.eclipse.xtext.reference.parser.packrat; import org.eclipse.xtext.parser.packrat.AbstractParserConfiguration; -import org.eclipse.xtext.parser.packrat.ICharSequenceWithOffset; -import org.eclipse.xtext.parser.packrat.IHiddenTokenHandler; -import org.eclipse.xtext.parser.packrat.IMarkerFactory; -import org.eclipse.xtext.parser.packrat.consumers.IConsumerUtility; -import org.eclipse.xtext.parser.packrat.consumers.INonTerminalConsumer; import org.eclipse.xtext.parser.packrat.consumers.ITerminalConsumer; -import org.eclipse.xtext.parser.packrat.tokens.IParsedTokenAcceptor; import org.eclipse.xtext.builtin.parser.packrat.XtextBuiltinParserConfiguration; @@ -30,6 +24,7 @@ import org.eclipse.xtext.builtin.parser.packrat.consumers.XtextBuiltinSL_COMMENT import org.eclipse.xtext.builtin.parser.packrat.consumers.XtextBuiltinWSConsumer; import org.eclipse.xtext.builtin.parser.packrat.consumers.XtextBuiltinANY_OTHERConsumer; +@SuppressWarnings("unused") public class ReferenceGrammarParserConfiguration extends AbstractParserConfiguration { private XtextBuiltinParserConfiguration xtextBuiltinConfiguration; @@ -43,11 +38,9 @@ public class ReferenceGrammarParserConfiguration extends AbstractParserConfigura private ReferenceGrammarFarbeConsumer farbeConsumer; private ReferenceGrammarCustomTypeParserRuleConsumer customTypeParserRuleConsumer; - public ReferenceGrammarParserConfiguration(ICharSequenceWithOffset input, IMarkerFactory markerFactory, - IParsedTokenAcceptor tokenAcceptor, IHiddenTokenHandler hiddenTokenHandler, IConsumerUtility consumerUtil) { - super(input, markerFactory, tokenAcceptor, hiddenTokenHandler, consumerUtil); - this.xtextBuiltinConfiguration = new XtextBuiltinParserConfiguration( - input, markerFactory, tokenAcceptor, hiddenTokenHandler, consumerUtil); + public ReferenceGrammarParserConfiguration(IInternalParserConfiguration configuration) { + super(configuration); + this.xtextBuiltinConfiguration = new XtextBuiltinParserConfiguration(configuration); } public ReferenceGrammarSpielplatzConsumer getRootConsumer() { @@ -57,28 +50,28 @@ public class ReferenceGrammarParserConfiguration extends AbstractParserConfigura public void createNonTerminalConsumers() { getXtextBuiltinConfiguration().createNonTerminalConsumers(); spielplatzConsumer = new ReferenceGrammarSpielplatzConsumer( - getInput(), getMarkerFactory(), getTokenAcceptor(), getHiddenTokenHandler(), getConsumerUtil(), null + this, null ); personConsumer = new ReferenceGrammarPersonConsumer( - getInput(), getMarkerFactory(), getTokenAcceptor(), getHiddenTokenHandler(), getConsumerUtil(), null + this, null ); kindConsumer = new ReferenceGrammarKindConsumer( - getInput(), getMarkerFactory(), getTokenAcceptor(), getHiddenTokenHandler(), getConsumerUtil(), null + this, null ); erwachsenerConsumer = new ReferenceGrammarErwachsenerConsumer( - getInput(), getMarkerFactory(), getTokenAcceptor(), getHiddenTokenHandler(), getConsumerUtil(), null + this, null ); spielzeugConsumer = new ReferenceGrammarSpielzeugConsumer( - getInput(), getMarkerFactory(), getTokenAcceptor(), getHiddenTokenHandler(), getConsumerUtil(), null + this, null ); familieConsumer = new ReferenceGrammarFamilieConsumer( - getInput(), getMarkerFactory(), getTokenAcceptor(), getHiddenTokenHandler(), getConsumerUtil(), null + this, null ); farbeConsumer = new ReferenceGrammarFarbeConsumer( - getInput(), getMarkerFactory(), getTokenAcceptor(), getHiddenTokenHandler(), getConsumerUtil(), null + this, null ); customTypeParserRuleConsumer = new ReferenceGrammarCustomTypeParserRuleConsumer( - getInput(), getMarkerFactory(), getTokenAcceptor(), getHiddenTokenHandler(), getConsumerUtil(), null + this, null ); } diff --git a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarCustomTypeParserRuleConsumer.java b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarCustomTypeParserRuleConsumer.java index 9ceb470..5d9fa57 100644 --- a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarCustomTypeParserRuleConsumer.java +++ b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarCustomTypeParserRuleConsumer.java @@ -4,17 +4,13 @@ Generated with Xtext package org.eclipse.xtext.reference.parser.packrat.consumers; import org.eclipse.emf.ecore.EObject; -import org.eclipse.xtext.parser.packrat.ICharSequenceWithOffset; -import org.eclipse.xtext.parser.packrat.IHiddenTokenHandler; -import org.eclipse.xtext.parser.packrat.IMarkerFactory; 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.consumers.INonTerminalConsumerConfiguration; import org.eclipse.xtext.parser.packrat.consumers.ConsumeResult; 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.reference.services.ReferenceGrammarGrammarAccess; import org.eclipse.xtext.reference.services.ReferenceGrammarGrammarAccess.CustomTypeParserRuleElements; @@ -30,10 +26,8 @@ public final class ReferenceGrammarCustomTypeParserRuleConsumer extends NonTermi private ISequenceMatcher ruleCall$4$Delimiter; - public ReferenceGrammarCustomTypeParserRuleConsumer(ICharSequenceWithOffset input, IMarkerFactory markerFactory, - IParsedTokenAcceptor tokenAcceptor, IHiddenTokenHandler hiddenTokenHandler, IConsumerUtility consumerUtil, - ITerminalConsumer[] hiddenTokens) { - super(input, markerFactory, tokenAcceptor, hiddenTokenHandler, consumerUtil, hiddenTokens); + public ReferenceGrammarCustomTypeParserRuleConsumer(INonTerminalConsumerConfiguration configuration, ITerminalConsumer[] hiddenTokens) { + super(configuration, hiddenTokens); keyword$2$Delimiter = ICharacterClass.Factory.nullClass(); ruleCall$4$Delimiter = ISequenceMatcher.Factory.nullMatcher(); } diff --git a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarErwachsenerConsumer.java b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarErwachsenerConsumer.java index 18cd6e7..f24b888 100644 --- a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarErwachsenerConsumer.java +++ b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarErwachsenerConsumer.java @@ -4,17 +4,13 @@ Generated with Xtext package org.eclipse.xtext.reference.parser.packrat.consumers; import org.eclipse.emf.ecore.EObject; -import org.eclipse.xtext.parser.packrat.ICharSequenceWithOffset; -import org.eclipse.xtext.parser.packrat.IHiddenTokenHandler; -import org.eclipse.xtext.parser.packrat.IMarkerFactory; 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.consumers.INonTerminalConsumerConfiguration; import org.eclipse.xtext.parser.packrat.consumers.ConsumeResult; 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.reference.services.ReferenceGrammarGrammarAccess; import org.eclipse.xtext.reference.services.ReferenceGrammarGrammarAccess.ErwachsenerElements; @@ -38,10 +34,8 @@ public final class ReferenceGrammarErwachsenerConsumer extends NonTerminalConsum private ISequenceMatcher ruleCall$10$Delimiter; - public ReferenceGrammarErwachsenerConsumer(ICharSequenceWithOffset input, IMarkerFactory markerFactory, - IParsedTokenAcceptor tokenAcceptor, IHiddenTokenHandler hiddenTokenHandler, IConsumerUtility consumerUtil, - ITerminalConsumer[] hiddenTokens) { - super(input, markerFactory, tokenAcceptor, hiddenTokenHandler, consumerUtil, hiddenTokens); + public ReferenceGrammarErwachsenerConsumer(INonTerminalConsumerConfiguration configuration, ITerminalConsumer[] hiddenTokens) { + super(configuration, hiddenTokens); keyword$5$Delimiter = ICharacterClass.Factory.nullClass(); keyword$6$Delimiter = ICharacterClass.Factory.nullClass(); keyword$11$Delimiter = ICharacterClass.Factory.nullClass(); diff --git a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarFamilieConsumer.java b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarFamilieConsumer.java index 782328a..787daa5 100644 --- a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarFamilieConsumer.java +++ b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarFamilieConsumer.java @@ -4,17 +4,13 @@ Generated with Xtext package org.eclipse.xtext.reference.parser.packrat.consumers; import org.eclipse.emf.ecore.EObject; -import org.eclipse.xtext.parser.packrat.ICharSequenceWithOffset; -import org.eclipse.xtext.parser.packrat.IHiddenTokenHandler; -import org.eclipse.xtext.parser.packrat.IMarkerFactory; 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.consumers.INonTerminalConsumerConfiguration; import org.eclipse.xtext.parser.packrat.consumers.ConsumeResult; 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.reference.services.ReferenceGrammarGrammarAccess; import org.eclipse.xtext.reference.services.ReferenceGrammarGrammarAccess.FamilieElements; @@ -50,10 +46,8 @@ public final class ReferenceGrammarFamilieConsumer extends NonTerminalConsumer { private ISequenceMatcher ruleCall$15$Delimiter; - public ReferenceGrammarFamilieConsumer(ICharSequenceWithOffset input, IMarkerFactory markerFactory, - IParsedTokenAcceptor tokenAcceptor, IHiddenTokenHandler hiddenTokenHandler, IConsumerUtility consumerUtil, - ITerminalConsumer[] hiddenTokens) { - super(input, markerFactory, tokenAcceptor, hiddenTokenHandler, consumerUtil, hiddenTokens); + public ReferenceGrammarFamilieConsumer(INonTerminalConsumerConfiguration configuration, ITerminalConsumer[] hiddenTokens) { + super(configuration, hiddenTokens); crossReference$28$Delimiter = ISequenceMatcher.Factory.nullMatcher(); crossReference$17$Delimiter = ISequenceMatcher.Factory.nullMatcher(); crossReference$20$Delimiter = ISequenceMatcher.Factory.nullMatcher(); diff --git a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarFarbeConsumer.java b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarFarbeConsumer.java index c765ce1..712ad0c 100644 --- a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarFarbeConsumer.java +++ b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarFarbeConsumer.java @@ -4,17 +4,13 @@ Generated with Xtext package org.eclipse.xtext.reference.parser.packrat.consumers; import org.eclipse.emf.ecore.EObject; -import org.eclipse.xtext.parser.packrat.ICharSequenceWithOffset; -import org.eclipse.xtext.parser.packrat.IHiddenTokenHandler; -import org.eclipse.xtext.parser.packrat.IMarkerFactory; 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.consumers.INonTerminalConsumerConfiguration; import org.eclipse.xtext.parser.packrat.consumers.ConsumeResult; 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.reference.services.ReferenceGrammarGrammarAccess; import org.eclipse.xtext.reference.services.ReferenceGrammarGrammarAccess.FarbeElements; @@ -32,10 +28,8 @@ public final class ReferenceGrammarFarbeConsumer extends NonTerminalConsumer { private ICharacterClass keyword$8$Delimiter; - public ReferenceGrammarFarbeConsumer(ICharSequenceWithOffset input, IMarkerFactory markerFactory, - IParsedTokenAcceptor tokenAcceptor, IHiddenTokenHandler hiddenTokenHandler, IConsumerUtility consumerUtil, - ITerminalConsumer[] hiddenTokens) { - super(input, markerFactory, tokenAcceptor, hiddenTokenHandler, consumerUtil, hiddenTokens); + public ReferenceGrammarFarbeConsumer(INonTerminalConsumerConfiguration configuration, ITerminalConsumer[] hiddenTokens) { + super(configuration, hiddenTokens); keyword$5$Delimiter = ICharacterClass.Factory.nullClass(); keyword$6$Delimiter = ICharacterClass.Factory.nullClass(); keyword$7$Delimiter = ICharacterClass.Factory.nullClass(); diff --git a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarKindConsumer.java b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarKindConsumer.java index 7af94af..0980fcf 100644 --- a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarKindConsumer.java +++ b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarKindConsumer.java @@ -4,17 +4,13 @@ Generated with Xtext package org.eclipse.xtext.reference.parser.packrat.consumers; import org.eclipse.emf.ecore.EObject; -import org.eclipse.xtext.parser.packrat.ICharSequenceWithOffset; -import org.eclipse.xtext.parser.packrat.IHiddenTokenHandler; -import org.eclipse.xtext.parser.packrat.IMarkerFactory; 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.consumers.INonTerminalConsumerConfiguration; import org.eclipse.xtext.parser.packrat.consumers.ConsumeResult; 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.reference.services.ReferenceGrammarGrammarAccess; import org.eclipse.xtext.reference.services.ReferenceGrammarGrammarAccess.KindElements; @@ -38,10 +34,8 @@ public final class ReferenceGrammarKindConsumer extends NonTerminalConsumer { private ISequenceMatcher ruleCall$10$Delimiter; - public ReferenceGrammarKindConsumer(ICharSequenceWithOffset input, IMarkerFactory markerFactory, - IParsedTokenAcceptor tokenAcceptor, IHiddenTokenHandler hiddenTokenHandler, IConsumerUtility consumerUtil, - ITerminalConsumer[] hiddenTokens) { - super(input, markerFactory, tokenAcceptor, hiddenTokenHandler, consumerUtil, hiddenTokens); + public ReferenceGrammarKindConsumer(INonTerminalConsumerConfiguration configuration, ITerminalConsumer[] hiddenTokens) { + super(configuration, hiddenTokens); keyword$5$Delimiter = ICharacterClass.Factory.nullClass(); keyword$6$Delimiter = ICharacterClass.Factory.nullClass(); keyword$11$Delimiter = ICharacterClass.Factory.nullClass(); diff --git a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarPersonConsumer.java b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarPersonConsumer.java index 71dd600..a94037d 100644 --- a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarPersonConsumer.java +++ b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarPersonConsumer.java @@ -4,17 +4,13 @@ Generated with Xtext package org.eclipse.xtext.reference.parser.packrat.consumers; import org.eclipse.emf.ecore.EObject; -import org.eclipse.xtext.parser.packrat.ICharSequenceWithOffset; -import org.eclipse.xtext.parser.packrat.IHiddenTokenHandler; -import org.eclipse.xtext.parser.packrat.IMarkerFactory; 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.consumers.INonTerminalConsumerConfiguration; import org.eclipse.xtext.parser.packrat.consumers.ConsumeResult; 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.reference.services.ReferenceGrammarGrammarAccess; import org.eclipse.xtext.reference.services.ReferenceGrammarGrammarAccess.PersonElements; @@ -28,10 +24,8 @@ public final class ReferenceGrammarPersonConsumer extends NonTerminalConsumer { private ReferenceGrammarErwachsenerConsumer erwachsenerConsumer; private ReferenceGrammarKindConsumer kindConsumer; - public ReferenceGrammarPersonConsumer(ICharSequenceWithOffset input, IMarkerFactory markerFactory, - IParsedTokenAcceptor tokenAcceptor, IHiddenTokenHandler hiddenTokenHandler, IConsumerUtility consumerUtil, - ITerminalConsumer[] hiddenTokens) { - super(input, markerFactory, tokenAcceptor, hiddenTokenHandler, consumerUtil, hiddenTokens); + public ReferenceGrammarPersonConsumer(INonTerminalConsumerConfiguration configuration, ITerminalConsumer[] hiddenTokens) { + super(configuration, hiddenTokens); } protected int doConsume() throws Exception { diff --git a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarSpielplatzConsumer.java b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarSpielplatzConsumer.java index 14ee7c2..9d3392f 100644 --- a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarSpielplatzConsumer.java +++ b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarSpielplatzConsumer.java @@ -4,17 +4,13 @@ Generated with Xtext package org.eclipse.xtext.reference.parser.packrat.consumers; import org.eclipse.emf.ecore.EObject; -import org.eclipse.xtext.parser.packrat.ICharSequenceWithOffset; -import org.eclipse.xtext.parser.packrat.IHiddenTokenHandler; -import org.eclipse.xtext.parser.packrat.IMarkerFactory; 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.consumers.INonTerminalConsumerConfiguration; import org.eclipse.xtext.parser.packrat.consumers.ConsumeResult; 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.reference.services.ReferenceGrammarGrammarAccess; import org.eclipse.xtext.reference.services.ReferenceGrammarGrammarAccess.SpielplatzElements; @@ -48,10 +44,8 @@ public final class ReferenceGrammarSpielplatzConsumer extends NonTerminalConsume private ISequenceMatcher ruleCall$10$Delimiter; - public ReferenceGrammarSpielplatzConsumer(ICharSequenceWithOffset input, IMarkerFactory markerFactory, - IParsedTokenAcceptor tokenAcceptor, IHiddenTokenHandler hiddenTokenHandler, IConsumerUtility consumerUtil, - ITerminalConsumer[] hiddenTokens) { - super(input, markerFactory, tokenAcceptor, hiddenTokenHandler, consumerUtil, hiddenTokens); + public ReferenceGrammarSpielplatzConsumer(INonTerminalConsumerConfiguration configuration, ITerminalConsumer[] hiddenTokens) { + super(configuration, hiddenTokens); keyword$11$Delimiter = ICharacterClass.Factory.nullClass(); keyword$26$Delimiter = ICharacterClass.Factory.nullClass(); keyword$6$Delimiter = ICharacterClass.Factory.nullClass(); diff --git a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarSpielzeugConsumer.java b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarSpielzeugConsumer.java index c6300e6..7f74556 100644 --- a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarSpielzeugConsumer.java +++ b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarSpielzeugConsumer.java @@ -4,17 +4,13 @@ Generated with Xtext package org.eclipse.xtext.reference.parser.packrat.consumers; import org.eclipse.emf.ecore.EObject; -import org.eclipse.xtext.parser.packrat.ICharSequenceWithOffset; -import org.eclipse.xtext.parser.packrat.IHiddenTokenHandler; -import org.eclipse.xtext.parser.packrat.IMarkerFactory; 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.consumers.INonTerminalConsumerConfiguration; import org.eclipse.xtext.parser.packrat.consumers.ConsumeResult; 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.reference.services.ReferenceGrammarGrammarAccess; import org.eclipse.xtext.reference.services.ReferenceGrammarGrammarAccess.SpielzeugElements; @@ -36,10 +32,8 @@ public final class ReferenceGrammarSpielzeugConsumer extends NonTerminalConsumer private ISequenceMatcher ruleCall$8$Delimiter; - public ReferenceGrammarSpielzeugConsumer(ICharSequenceWithOffset input, IMarkerFactory markerFactory, - IParsedTokenAcceptor tokenAcceptor, IHiddenTokenHandler hiddenTokenHandler, IConsumerUtility consumerUtil, - ITerminalConsumer[] hiddenTokens) { - super(input, markerFactory, tokenAcceptor, hiddenTokenHandler, consumerUtil, hiddenTokens); + public ReferenceGrammarSpielzeugConsumer(INonTerminalConsumerConfiguration configuration, ITerminalConsumer[] hiddenTokens) { + super(configuration, hiddenTokens); keyword$5$Delimiter = ICharacterClass.Factory.nullClass(); keyword$6$Delimiter = ICharacterClass.Factory.nullClass(); keyword$11$Delimiter = ICharacterClass.Factory.nullClass(); diff --git a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/DomainmodelPackratParser.java b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/DomainmodelPackratParser.java index 37b2b77..da4eade 100644 --- a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/DomainmodelPackratParser.java +++ b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/DomainmodelPackratParser.java @@ -4,19 +4,13 @@ Generated with Xtext package org.eclipse.xtext.example.parser.packrat; import org.eclipse.xtext.parser.packrat.AbstractPackratParser; -import org.eclipse.xtext.parser.packrat.ICharSequenceWithOffset; -import org.eclipse.xtext.parser.packrat.IHiddenTokenHandler; -import org.eclipse.xtext.parser.packrat.IMarkerFactory; -import org.eclipse.xtext.parser.packrat.consumers.IConsumerUtility; -import org.eclipse.xtext.parser.packrat.tokens.IParsedTokenAcceptor; +import org.eclipse.xtext.parser.packrat.AbstractParserConfiguration.IInternalParserConfiguration; public class DomainmodelPackratParser extends AbstractPackratParser { @Override - protected DomainmodelParserConfiguration createParserConfiguration(ICharSequenceWithOffset input, - IMarkerFactory markerFactory, IParsedTokenAcceptor tokenAcceptor, IHiddenTokenHandler hiddenTokenHandler, - IConsumerUtility consumerUtil) { - return new DomainmodelParserConfiguration(input, markerFactory, tokenAcceptor, hiddenTokenHandler, consumerUtil); + protected DomainmodelParserConfiguration createParserConfiguration(IInternalParserConfiguration configuration) { + return new DomainmodelParserConfiguration(configuration); } } 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 a507e69..9302ae0 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 @@ -4,13 +4,7 @@ Generated with Xtext package org.eclipse.xtext.example.parser.packrat; import org.eclipse.xtext.parser.packrat.AbstractParserConfiguration; -import org.eclipse.xtext.parser.packrat.ICharSequenceWithOffset; -import org.eclipse.xtext.parser.packrat.IHiddenTokenHandler; -import org.eclipse.xtext.parser.packrat.IMarkerFactory; -import org.eclipse.xtext.parser.packrat.consumers.IConsumerUtility; -import org.eclipse.xtext.parser.packrat.consumers.INonTerminalConsumer; import org.eclipse.xtext.parser.packrat.consumers.ITerminalConsumer; -import org.eclipse.xtext.parser.packrat.tokens.IParsedTokenAcceptor; import org.eclipse.xtext.builtin.parser.packrat.XtextBuiltinParserConfiguration; @@ -38,6 +32,7 @@ import org.eclipse.xtext.builtin.parser.packrat.consumers.XtextBuiltinSL_COMMENT import org.eclipse.xtext.builtin.parser.packrat.consumers.XtextBuiltinWSConsumer; import org.eclipse.xtext.builtin.parser.packrat.consumers.XtextBuiltinANY_OTHERConsumer; +@SuppressWarnings("unused") public class DomainmodelParserConfiguration extends AbstractParserConfiguration { private XtextBuiltinParserConfiguration xtextBuiltinConfiguration; @@ -59,11 +54,9 @@ public class DomainmodelParserConfiguration extends AbstractParserConfiguration private DomainmodelTypeRefConsumer typeRefConsumer; private DomainmodelQualifiedNameConsumer qualifiedNameConsumer; - public DomainmodelParserConfiguration(ICharSequenceWithOffset input, IMarkerFactory markerFactory, - IParsedTokenAcceptor tokenAcceptor, IHiddenTokenHandler hiddenTokenHandler, IConsumerUtility consumerUtil) { - super(input, markerFactory, tokenAcceptor, hiddenTokenHandler, consumerUtil); - this.xtextBuiltinConfiguration = new XtextBuiltinParserConfiguration( - input, markerFactory, tokenAcceptor, hiddenTokenHandler, consumerUtil); + public DomainmodelParserConfiguration(IInternalParserConfiguration configuration) { + super(configuration); + this.xtextBuiltinConfiguration = new XtextBuiltinParserConfiguration(configuration); } public DomainmodelFileConsumer getRootConsumer() { @@ -73,52 +66,52 @@ public class DomainmodelParserConfiguration extends AbstractParserConfiguration public void createNonTerminalConsumers() { getXtextBuiltinConfiguration().createNonTerminalConsumers(); fileConsumer = new DomainmodelFileConsumer( - getInput(), getMarkerFactory(), getTokenAcceptor(), getHiddenTokenHandler(), getConsumerUtil(), null + this, null ); importConsumer = new DomainmodelImportConsumer( - getInput(), getMarkerFactory(), getTokenAcceptor(), getHiddenTokenHandler(), getConsumerUtil(), null + this, null ); namedElementConsumer = new DomainmodelNamedElementConsumer( - getInput(), getMarkerFactory(), getTokenAcceptor(), getHiddenTokenHandler(), getConsumerUtil(), null + this, null ); packageConsumer = new DomainmodelPackageConsumer( - getInput(), getMarkerFactory(), getTokenAcceptor(), getHiddenTokenHandler(), getConsumerUtil(), null + this, null ); typeConsumer = new DomainmodelTypeConsumer( - getInput(), getMarkerFactory(), getTokenAcceptor(), getHiddenTokenHandler(), getConsumerUtil(), null + this, null ); dataTypeConsumer = new DomainmodelDataTypeConsumer( - getInput(), getMarkerFactory(), getTokenAcceptor(), getHiddenTokenHandler(), getConsumerUtil(), null + this, null ); entityConsumer = new DomainmodelEntityConsumer( - getInput(), getMarkerFactory(), getTokenAcceptor(), getHiddenTokenHandler(), getConsumerUtil(), null + this, null ); featureConsumer = new DomainmodelFeatureConsumer( - getInput(), getMarkerFactory(), getTokenAcceptor(), getHiddenTokenHandler(), getConsumerUtil(), null + this, null ); structuralFeatureConsumer = new DomainmodelStructuralFeatureConsumer( - getInput(), getMarkerFactory(), getTokenAcceptor(), getHiddenTokenHandler(), getConsumerUtil(), null + this, null ); attributeConsumer = new DomainmodelAttributeConsumer( - getInput(), getMarkerFactory(), getTokenAcceptor(), getHiddenTokenHandler(), getConsumerUtil(), null + this, null ); referenceConsumer = new DomainmodelReferenceConsumer( - getInput(), getMarkerFactory(), getTokenAcceptor(), getHiddenTokenHandler(), getConsumerUtil(), null + this, null ); operationConsumer = new DomainmodelOperationConsumer( - getInput(), getMarkerFactory(), getTokenAcceptor(), getHiddenTokenHandler(), getConsumerUtil(), null + this, null ); parameterConsumer = new DomainmodelParameterConsumer( - getInput(), getMarkerFactory(), getTokenAcceptor(), getHiddenTokenHandler(), getConsumerUtil(), null + this, null ); typedElementConsumer = new DomainmodelTypedElementConsumer( - getInput(), getMarkerFactory(), getTokenAcceptor(), getHiddenTokenHandler(), getConsumerUtil(), null + this, null ); typeRefConsumer = new DomainmodelTypeRefConsumer( - getInput(), getMarkerFactory(), getTokenAcceptor(), getHiddenTokenHandler(), getConsumerUtil(), null + this, null ); qualifiedNameConsumer = new DomainmodelQualifiedNameConsumer( - getInput(), getMarkerFactory(), getTokenAcceptor(), getHiddenTokenHandler(), getConsumerUtil(), null + this, null ); } 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 c636603..9af17af 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 @@ -4,17 +4,13 @@ Generated with Xtext package org.eclipse.xtext.example.parser.packrat.consumers; import org.eclipse.emf.ecore.EObject; -import org.eclipse.xtext.parser.packrat.ICharSequenceWithOffset; -import org.eclipse.xtext.parser.packrat.IHiddenTokenHandler; -import org.eclipse.xtext.parser.packrat.IMarkerFactory; 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.consumers.INonTerminalConsumerConfiguration; import org.eclipse.xtext.parser.packrat.consumers.ConsumeResult; 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; @@ -34,10 +30,8 @@ public final class DomainmodelAttributeConsumer extends NonTerminalConsumer { private ISequenceMatcher ruleCall$6$Delimiter; - public DomainmodelAttributeConsumer(ICharSequenceWithOffset input, IMarkerFactory markerFactory, - IParsedTokenAcceptor tokenAcceptor, IHiddenTokenHandler hiddenTokenHandler, IConsumerUtility consumerUtil, - ITerminalConsumer[] hiddenTokens) { - super(input, markerFactory, tokenAcceptor, hiddenTokenHandler, consumerUtil, hiddenTokens); + public DomainmodelAttributeConsumer(INonTerminalConsumerConfiguration configuration, ITerminalConsumer[] hiddenTokens) { + super(configuration, hiddenTokens); keyword$4$Delimiter = ICharacterClass.Factory.nullClass(); keyword$7$Delimiter = ICharacterClass.Factory.nullClass(); ruleCall$6$Delimiter = ISequenceMatcher.Factory.nullMatcher(); 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 80b517e..ad17ca7 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 @@ -4,17 +4,13 @@ Generated with Xtext package org.eclipse.xtext.example.parser.packrat.consumers; import org.eclipse.emf.ecore.EObject; -import org.eclipse.xtext.parser.packrat.ICharSequenceWithOffset; -import org.eclipse.xtext.parser.packrat.IHiddenTokenHandler; -import org.eclipse.xtext.parser.packrat.IMarkerFactory; 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.consumers.INonTerminalConsumerConfiguration; import org.eclipse.xtext.parser.packrat.consumers.ConsumeResult; 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; @@ -30,10 +26,8 @@ public final class DomainmodelDataTypeConsumer extends NonTerminalConsumer { 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); + public DomainmodelDataTypeConsumer(INonTerminalConsumerConfiguration configuration, ITerminalConsumer[] hiddenTokens) { + super(configuration, hiddenTokens); keyword$2$Delimiter = ICharacterClass.Factory.nullClass(); ruleCall$4$Delimiter = 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 c76dfed..6b76b7e 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 @@ -4,17 +4,13 @@ Generated with Xtext package org.eclipse.xtext.example.parser.packrat.consumers; import org.eclipse.emf.ecore.EObject; -import org.eclipse.xtext.parser.packrat.ICharSequenceWithOffset; -import org.eclipse.xtext.parser.packrat.IHiddenTokenHandler; -import org.eclipse.xtext.parser.packrat.IMarkerFactory; 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.consumers.INonTerminalConsumerConfiguration; import org.eclipse.xtext.parser.packrat.consumers.ConsumeResult; 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; @@ -40,10 +36,8 @@ public final class DomainmodelEntityConsumer extends NonTerminalConsumer { private ISequenceMatcher ruleCall$8$Delimiter; - public DomainmodelEntityConsumer(ICharSequenceWithOffset input, IMarkerFactory markerFactory, - IParsedTokenAcceptor tokenAcceptor, IHiddenTokenHandler hiddenTokenHandler, IConsumerUtility consumerUtil, - ITerminalConsumer[] hiddenTokens) { - super(input, markerFactory, tokenAcceptor, hiddenTokenHandler, consumerUtil, hiddenTokens); + public DomainmodelEntityConsumer(INonTerminalConsumerConfiguration configuration, ITerminalConsumer[] hiddenTokens) { + super(configuration, hiddenTokens); crossReference$12$Delimiter = ISequenceMatcher.Factory.nullMatcher(); keyword$6$Delimiter = ICharacterClass.Factory.nullClass(); keyword$10$Delimiter = 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 4455dbf..8bdd4c8 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 @@ -4,17 +4,13 @@ Generated with Xtext package org.eclipse.xtext.example.parser.packrat.consumers; import org.eclipse.emf.ecore.EObject; -import org.eclipse.xtext.parser.packrat.ICharSequenceWithOffset; -import org.eclipse.xtext.parser.packrat.IHiddenTokenHandler; -import org.eclipse.xtext.parser.packrat.IMarkerFactory; 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.consumers.INonTerminalConsumerConfiguration; import org.eclipse.xtext.parser.packrat.consumers.ConsumeResult; 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; @@ -28,10 +24,8 @@ public final class DomainmodelFeatureConsumer extends NonTerminalConsumer { private DomainmodelOperationConsumer operationConsumer; private DomainmodelStructuralFeatureConsumer structuralFeatureConsumer; - public DomainmodelFeatureConsumer(ICharSequenceWithOffset input, IMarkerFactory markerFactory, - IParsedTokenAcceptor tokenAcceptor, IHiddenTokenHandler hiddenTokenHandler, IConsumerUtility consumerUtil, - ITerminalConsumer[] hiddenTokens) { - super(input, markerFactory, tokenAcceptor, hiddenTokenHandler, consumerUtil, hiddenTokens); + public DomainmodelFeatureConsumer(INonTerminalConsumerConfiguration configuration, ITerminalConsumer[] hiddenTokens) { + super(configuration, hiddenTokens); } protected int doConsume() throws Exception { 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 9ba0960..3e942d3 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 @@ -4,17 +4,13 @@ Generated with Xtext package org.eclipse.xtext.example.parser.packrat.consumers; import org.eclipse.emf.ecore.EObject; -import org.eclipse.xtext.parser.packrat.ICharSequenceWithOffset; -import org.eclipse.xtext.parser.packrat.IHiddenTokenHandler; -import org.eclipse.xtext.parser.packrat.IMarkerFactory; 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.consumers.INonTerminalConsumerConfiguration; import org.eclipse.xtext.parser.packrat.consumers.ConsumeResult; 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; @@ -28,10 +24,8 @@ public final class DomainmodelFileConsumer extends NonTerminalConsumer { private DomainmodelImportConsumer importConsumer; private DomainmodelNamedElementConsumer namedElementConsumer; - public DomainmodelFileConsumer(ICharSequenceWithOffset input, IMarkerFactory markerFactory, - IParsedTokenAcceptor tokenAcceptor, IHiddenTokenHandler hiddenTokenHandler, IConsumerUtility consumerUtil, - ITerminalConsumer[] hiddenTokens) { - super(input, markerFactory, tokenAcceptor, hiddenTokenHandler, consumerUtil, hiddenTokens); + public DomainmodelFileConsumer(INonTerminalConsumerConfiguration configuration, ITerminalConsumer[] hiddenTokens) { + super(configuration, hiddenTokens); } protected int doConsume() throws Exception { 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 d06c29c..406bec4 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 @@ -4,17 +4,13 @@ Generated with Xtext package org.eclipse.xtext.example.parser.packrat.consumers; import org.eclipse.emf.ecore.EObject; -import org.eclipse.xtext.parser.packrat.ICharSequenceWithOffset; -import org.eclipse.xtext.parser.packrat.IHiddenTokenHandler; -import org.eclipse.xtext.parser.packrat.IMarkerFactory; 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.consumers.INonTerminalConsumerConfiguration; import org.eclipse.xtext.parser.packrat.consumers.ConsumeResult; 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; @@ -30,10 +26,8 @@ public final class DomainmodelImportConsumer extends NonTerminalConsumer { 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); + public DomainmodelImportConsumer(INonTerminalConsumerConfiguration configuration, ITerminalConsumer[] hiddenTokens) { + super(configuration, hiddenTokens); keyword$2$Delimiter = ICharacterClass.Factory.nullClass(); ruleCall$4$Delimiter = 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 3648ce4..0840afb 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 @@ -4,17 +4,13 @@ Generated with Xtext package org.eclipse.xtext.example.parser.packrat.consumers; import org.eclipse.emf.ecore.EObject; -import org.eclipse.xtext.parser.packrat.ICharSequenceWithOffset; -import org.eclipse.xtext.parser.packrat.IHiddenTokenHandler; -import org.eclipse.xtext.parser.packrat.IMarkerFactory; 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.consumers.INonTerminalConsumerConfiguration; import org.eclipse.xtext.parser.packrat.consumers.ConsumeResult; 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; @@ -28,10 +24,8 @@ public final class DomainmodelNamedElementConsumer extends NonTerminalConsumer { private DomainmodelPackageConsumer packageConsumer; private DomainmodelTypeConsumer typeConsumer; - public DomainmodelNamedElementConsumer(ICharSequenceWithOffset input, IMarkerFactory markerFactory, - IParsedTokenAcceptor tokenAcceptor, IHiddenTokenHandler hiddenTokenHandler, IConsumerUtility consumerUtil, - ITerminalConsumer[] hiddenTokens) { - super(input, markerFactory, tokenAcceptor, hiddenTokenHandler, consumerUtil, hiddenTokens); + public DomainmodelNamedElementConsumer(INonTerminalConsumerConfiguration configuration, ITerminalConsumer[] hiddenTokens) { + super(configuration, hiddenTokens); } protected int doConsume() throws Exception { 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 985e82d..d32da1f 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 @@ -4,17 +4,13 @@ Generated with Xtext package org.eclipse.xtext.example.parser.packrat.consumers; import org.eclipse.emf.ecore.EObject; -import org.eclipse.xtext.parser.packrat.ICharSequenceWithOffset; -import org.eclipse.xtext.parser.packrat.IHiddenTokenHandler; -import org.eclipse.xtext.parser.packrat.IMarkerFactory; 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.consumers.INonTerminalConsumerConfiguration; import org.eclipse.xtext.parser.packrat.consumers.ConsumeResult; 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; @@ -42,10 +38,8 @@ public final class DomainmodelOperationConsumer extends NonTerminalConsumer { private ISequenceMatcher ruleCall$9$Delimiter; - public DomainmodelOperationConsumer(ICharSequenceWithOffset input, IMarkerFactory markerFactory, - IParsedTokenAcceptor tokenAcceptor, IHiddenTokenHandler hiddenTokenHandler, IConsumerUtility consumerUtil, - ITerminalConsumer[] hiddenTokens) { - super(input, markerFactory, tokenAcceptor, hiddenTokenHandler, consumerUtil, hiddenTokens); + public DomainmodelOperationConsumer(INonTerminalConsumerConfiguration configuration, ITerminalConsumer[] hiddenTokens) { + super(configuration, hiddenTokens); keyword$7$Delimiter = ICharacterClass.Factory.nullClass(); keyword$10$Delimiter = ICharacterClass.Factory.nullClass(); keyword$15$Delimiter = 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 e35d563..919073e 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 @@ -4,17 +4,13 @@ Generated with Xtext package org.eclipse.xtext.example.parser.packrat.consumers; import org.eclipse.emf.ecore.EObject; -import org.eclipse.xtext.parser.packrat.ICharSequenceWithOffset; -import org.eclipse.xtext.parser.packrat.IHiddenTokenHandler; -import org.eclipse.xtext.parser.packrat.IMarkerFactory; 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.consumers.INonTerminalConsumerConfiguration; import org.eclipse.xtext.parser.packrat.consumers.ConsumeResult; 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; @@ -34,10 +30,8 @@ public final class DomainmodelPackageConsumer extends NonTerminalConsumer { private ICharacterClass keyword$11$Delimiter; - public DomainmodelPackageConsumer(ICharSequenceWithOffset input, IMarkerFactory markerFactory, - IParsedTokenAcceptor tokenAcceptor, IHiddenTokenHandler hiddenTokenHandler, IConsumerUtility consumerUtil, - ITerminalConsumer[] hiddenTokens) { - super(input, markerFactory, tokenAcceptor, hiddenTokenHandler, consumerUtil, hiddenTokens); + public DomainmodelPackageConsumer(INonTerminalConsumerConfiguration configuration, ITerminalConsumer[] hiddenTokens) { + super(configuration, hiddenTokens); keyword$5$Delimiter = ICharacterClass.Factory.nullClass(); keyword$8$Delimiter = ICharacterClass.Factory.nullClass(); keyword$11$Delimiter = 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 a1bd0de..747685f 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 @@ -4,17 +4,13 @@ Generated with Xtext package org.eclipse.xtext.example.parser.packrat.consumers; import org.eclipse.emf.ecore.EObject; -import org.eclipse.xtext.parser.packrat.ICharSequenceWithOffset; -import org.eclipse.xtext.parser.packrat.IHiddenTokenHandler; -import org.eclipse.xtext.parser.packrat.IMarkerFactory; 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.consumers.INonTerminalConsumerConfiguration; import org.eclipse.xtext.parser.packrat.consumers.ConsumeResult; 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; @@ -30,10 +26,8 @@ public final class DomainmodelParameterConsumer extends NonTerminalConsumer { 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); + public DomainmodelParameterConsumer(INonTerminalConsumerConfiguration configuration, ITerminalConsumer[] hiddenTokens) { + super(configuration, hiddenTokens); ruleCall$3$Delimiter = 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 93e3f50..d336ba5 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 @@ -4,17 +4,13 @@ Generated with Xtext package org.eclipse.xtext.example.parser.packrat.consumers; import org.eclipse.emf.ecore.EObject; -import org.eclipse.xtext.parser.packrat.ICharSequenceWithOffset; -import org.eclipse.xtext.parser.packrat.IHiddenTokenHandler; -import org.eclipse.xtext.parser.packrat.IMarkerFactory; 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.consumers.INonTerminalConsumerConfiguration; import org.eclipse.xtext.parser.packrat.consumers.ConsumeResult; 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; @@ -32,10 +28,8 @@ public final class DomainmodelQualifiedNameConsumer extends NonTerminalConsumer private ISequenceMatcher ruleCall$5$Delimiter; - public DomainmodelQualifiedNameConsumer(ICharSequenceWithOffset input, IMarkerFactory markerFactory, - IParsedTokenAcceptor tokenAcceptor, IHiddenTokenHandler hiddenTokenHandler, IConsumerUtility consumerUtil, - ITerminalConsumer[] hiddenTokens) { - super(input, markerFactory, tokenAcceptor, hiddenTokenHandler, consumerUtil, hiddenTokens); + public DomainmodelQualifiedNameConsumer(INonTerminalConsumerConfiguration configuration, ITerminalConsumer[] hiddenTokens) { + super(configuration, hiddenTokens); keyword$4$Delimiter = ICharacterClass.Factory.nullClass(); ruleCall$2$Delimiter = ISequenceMatcher.Factory.nullMatcher(); ruleCall$5$Delimiter = 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 f018e52..1ffc38e 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 @@ -4,17 +4,13 @@ Generated with Xtext package org.eclipse.xtext.example.parser.packrat.consumers; import org.eclipse.emf.ecore.EObject; -import org.eclipse.xtext.parser.packrat.ICharSequenceWithOffset; -import org.eclipse.xtext.parser.packrat.IHiddenTokenHandler; -import org.eclipse.xtext.parser.packrat.IMarkerFactory; 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.consumers.INonTerminalConsumerConfiguration; import org.eclipse.xtext.parser.packrat.consumers.ConsumeResult; 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; @@ -38,10 +34,8 @@ public final class DomainmodelReferenceConsumer extends NonTerminalConsumer { private ISequenceMatcher ruleCall$7$Delimiter; - public DomainmodelReferenceConsumer(ICharSequenceWithOffset input, IMarkerFactory markerFactory, - IParsedTokenAcceptor tokenAcceptor, IHiddenTokenHandler hiddenTokenHandler, IConsumerUtility consumerUtil, - ITerminalConsumer[] hiddenTokens) { - super(input, markerFactory, tokenAcceptor, hiddenTokenHandler, consumerUtil, hiddenTokens); + public DomainmodelReferenceConsumer(INonTerminalConsumerConfiguration configuration, ITerminalConsumer[] hiddenTokens) { + super(configuration, hiddenTokens); crossReference$14$Delimiter = ISequenceMatcher.Factory.nullMatcher(); keyword$5$Delimiter = ICharacterClass.Factory.nullClass(); keyword$8$Delimiter = 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 f3855b3..b879946 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 @@ -4,17 +4,13 @@ Generated with Xtext package org.eclipse.xtext.example.parser.packrat.consumers; import org.eclipse.emf.ecore.EObject; -import org.eclipse.xtext.parser.packrat.ICharSequenceWithOffset; -import org.eclipse.xtext.parser.packrat.IHiddenTokenHandler; -import org.eclipse.xtext.parser.packrat.IMarkerFactory; 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.consumers.INonTerminalConsumerConfiguration; import org.eclipse.xtext.parser.packrat.consumers.ConsumeResult; 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; @@ -28,10 +24,8 @@ public final class DomainmodelStructuralFeatureConsumer extends NonTerminalConsu private DomainmodelAttributeConsumer attributeConsumer; private DomainmodelReferenceConsumer referenceConsumer; - public DomainmodelStructuralFeatureConsumer(ICharSequenceWithOffset input, IMarkerFactory markerFactory, - IParsedTokenAcceptor tokenAcceptor, IHiddenTokenHandler hiddenTokenHandler, IConsumerUtility consumerUtil, - ITerminalConsumer[] hiddenTokens) { - super(input, markerFactory, tokenAcceptor, hiddenTokenHandler, consumerUtil, hiddenTokens); + public DomainmodelStructuralFeatureConsumer(INonTerminalConsumerConfiguration configuration, ITerminalConsumer[] hiddenTokens) { + super(configuration, hiddenTokens); } protected int doConsume() throws Exception { 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 6d7be28..fc049c0 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 @@ -4,17 +4,13 @@ Generated with Xtext package org.eclipse.xtext.example.parser.packrat.consumers; import org.eclipse.emf.ecore.EObject; -import org.eclipse.xtext.parser.packrat.ICharSequenceWithOffset; -import org.eclipse.xtext.parser.packrat.IHiddenTokenHandler; -import org.eclipse.xtext.parser.packrat.IMarkerFactory; 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.consumers.INonTerminalConsumerConfiguration; import org.eclipse.xtext.parser.packrat.consumers.ConsumeResult; 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; @@ -28,10 +24,8 @@ public final class DomainmodelTypeConsumer extends NonTerminalConsumer { private DomainmodelDataTypeConsumer dataTypeConsumer; private DomainmodelEntityConsumer entityConsumer; - public DomainmodelTypeConsumer(ICharSequenceWithOffset input, IMarkerFactory markerFactory, - IParsedTokenAcceptor tokenAcceptor, IHiddenTokenHandler hiddenTokenHandler, IConsumerUtility consumerUtil, - ITerminalConsumer[] hiddenTokens) { - super(input, markerFactory, tokenAcceptor, hiddenTokenHandler, consumerUtil, hiddenTokens); + public DomainmodelTypeConsumer(INonTerminalConsumerConfiguration configuration, ITerminalConsumer[] hiddenTokens) { + super(configuration, hiddenTokens); } protected int doConsume() throws Exception { 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 8db993b..50d86ff 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 @@ -4,17 +4,13 @@ Generated with Xtext package org.eclipse.xtext.example.parser.packrat.consumers; import org.eclipse.emf.ecore.EObject; -import org.eclipse.xtext.parser.packrat.ICharSequenceWithOffset; -import org.eclipse.xtext.parser.packrat.IHiddenTokenHandler; -import org.eclipse.xtext.parser.packrat.IMarkerFactory; 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.consumers.INonTerminalConsumerConfiguration; import org.eclipse.xtext.parser.packrat.consumers.ConsumeResult; 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; @@ -28,10 +24,8 @@ public final class DomainmodelTypeRefConsumer extends NonTerminalConsumer { 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); + public DomainmodelTypeRefConsumer(INonTerminalConsumerConfiguration configuration, ITerminalConsumer[] hiddenTokens) { + super(configuration, hiddenTokens); crossReference$2$Delimiter = 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 469ec6f..14f0cb8 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 @@ -4,17 +4,13 @@ Generated with Xtext package org.eclipse.xtext.example.parser.packrat.consumers; import org.eclipse.emf.ecore.EObject; -import org.eclipse.xtext.parser.packrat.ICharSequenceWithOffset; -import org.eclipse.xtext.parser.packrat.IHiddenTokenHandler; -import org.eclipse.xtext.parser.packrat.IMarkerFactory; 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.consumers.INonTerminalConsumerConfiguration; import org.eclipse.xtext.parser.packrat.consumers.ConsumeResult; 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; @@ -28,10 +24,8 @@ public final class DomainmodelTypedElementConsumer extends NonTerminalConsumer { private DomainmodelFeatureConsumer featureConsumer; private DomainmodelParameterConsumer parameterConsumer; - public DomainmodelTypedElementConsumer(ICharSequenceWithOffset input, IMarkerFactory markerFactory, - IParsedTokenAcceptor tokenAcceptor, IHiddenTokenHandler hiddenTokenHandler, IConsumerUtility consumerUtil, - ITerminalConsumer[] hiddenTokens) { - super(input, markerFactory, tokenAcceptor, hiddenTokenHandler, consumerUtil, hiddenTokens); + public DomainmodelTypedElementConsumer(INonTerminalConsumerConfiguration configuration, ITerminalConsumer[] hiddenTokens) { + super(configuration, hiddenTokens); } protected int doConsume() throws Exception { diff --git a/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/packrat/FowlerDslPackratParser.java b/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/packrat/FowlerDslPackratParser.java index b20830a..8669b0a 100644 --- a/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/packrat/FowlerDslPackratParser.java +++ b/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/packrat/FowlerDslPackratParser.java @@ -4,19 +4,13 @@ Generated with Xtext package org.eclipse.xtext.example.parser.packrat; import org.eclipse.xtext.parser.packrat.AbstractPackratParser; -import org.eclipse.xtext.parser.packrat.ICharSequenceWithOffset; -import org.eclipse.xtext.parser.packrat.IHiddenTokenHandler; -import org.eclipse.xtext.parser.packrat.IMarkerFactory; -import org.eclipse.xtext.parser.packrat.consumers.IConsumerUtility; -import org.eclipse.xtext.parser.packrat.tokens.IParsedTokenAcceptor; +import org.eclipse.xtext.parser.packrat.AbstractParserConfiguration.IInternalParserConfiguration; public class FowlerDslPackratParser extends AbstractPackratParser { @Override - protected FowlerDslParserConfiguration createParserConfiguration(ICharSequenceWithOffset input, - IMarkerFactory markerFactory, IParsedTokenAcceptor tokenAcceptor, IHiddenTokenHandler hiddenTokenHandler, - IConsumerUtility consumerUtil) { - return new FowlerDslParserConfiguration(input, markerFactory, tokenAcceptor, hiddenTokenHandler, consumerUtil); + protected FowlerDslParserConfiguration createParserConfiguration(IInternalParserConfiguration configuration) { + return new FowlerDslParserConfiguration(configuration); } } diff --git a/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/packrat/FowlerDslParserConfiguration.java b/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/packrat/FowlerDslParserConfiguration.java index e061a1b..6933f77 100644 --- a/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/packrat/FowlerDslParserConfiguration.java +++ b/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/packrat/FowlerDslParserConfiguration.java @@ -4,13 +4,7 @@ Generated with Xtext package org.eclipse.xtext.example.parser.packrat; import org.eclipse.xtext.parser.packrat.AbstractParserConfiguration; -import org.eclipse.xtext.parser.packrat.ICharSequenceWithOffset; -import org.eclipse.xtext.parser.packrat.IHiddenTokenHandler; -import org.eclipse.xtext.parser.packrat.IMarkerFactory; -import org.eclipse.xtext.parser.packrat.consumers.IConsumerUtility; -import org.eclipse.xtext.parser.packrat.consumers.INonTerminalConsumer; import org.eclipse.xtext.parser.packrat.consumers.ITerminalConsumer; -import org.eclipse.xtext.parser.packrat.tokens.IParsedTokenAcceptor; import org.eclipse.xtext.builtin.parser.packrat.XtextBuiltinParserConfiguration; @@ -27,6 +21,7 @@ import org.eclipse.xtext.builtin.parser.packrat.consumers.XtextBuiltinSL_COMMENT import org.eclipse.xtext.builtin.parser.packrat.consumers.XtextBuiltinWSConsumer; import org.eclipse.xtext.builtin.parser.packrat.consumers.XtextBuiltinANY_OTHERConsumer; +@SuppressWarnings("unused") public class FowlerDslParserConfiguration extends AbstractParserConfiguration { private XtextBuiltinParserConfiguration xtextBuiltinConfiguration; @@ -37,11 +32,9 @@ public class FowlerDslParserConfiguration extends AbstractParserConfiguration { private FowlerDslStateConsumer stateConsumer; private FowlerDslTransitionConsumer transitionConsumer; - public FowlerDslParserConfiguration(ICharSequenceWithOffset input, IMarkerFactory markerFactory, - IParsedTokenAcceptor tokenAcceptor, IHiddenTokenHandler hiddenTokenHandler, IConsumerUtility consumerUtil) { - super(input, markerFactory, tokenAcceptor, hiddenTokenHandler, consumerUtil); - this.xtextBuiltinConfiguration = new XtextBuiltinParserConfiguration( - input, markerFactory, tokenAcceptor, hiddenTokenHandler, consumerUtil); + public FowlerDslParserConfiguration(IInternalParserConfiguration configuration) { + super(configuration); + this.xtextBuiltinConfiguration = new XtextBuiltinParserConfiguration(configuration); } public FowlerDslStatemachineConsumer getRootConsumer() { @@ -51,19 +44,19 @@ public class FowlerDslParserConfiguration extends AbstractParserConfiguration { public void createNonTerminalConsumers() { getXtextBuiltinConfiguration().createNonTerminalConsumers(); statemachineConsumer = new FowlerDslStatemachineConsumer( - getInput(), getMarkerFactory(), getTokenAcceptor(), getHiddenTokenHandler(), getConsumerUtil(), null + this, null ); eventConsumer = new FowlerDslEventConsumer( - getInput(), getMarkerFactory(), getTokenAcceptor(), getHiddenTokenHandler(), getConsumerUtil(), null + this, null ); commandConsumer = new FowlerDslCommandConsumer( - getInput(), getMarkerFactory(), getTokenAcceptor(), getHiddenTokenHandler(), getConsumerUtil(), null + this, null ); stateConsumer = new FowlerDslStateConsumer( - getInput(), getMarkerFactory(), getTokenAcceptor(), getHiddenTokenHandler(), getConsumerUtil(), null + this, null ); transitionConsumer = new FowlerDslTransitionConsumer( - getInput(), getMarkerFactory(), getTokenAcceptor(), getHiddenTokenHandler(), getConsumerUtil(), null + this, null ); } diff --git a/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/FowlerDslCommandConsumer.java b/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/FowlerDslCommandConsumer.java index ef9f983..4cfd661 100644 --- a/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/FowlerDslCommandConsumer.java +++ b/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/FowlerDslCommandConsumer.java @@ -4,17 +4,13 @@ Generated with Xtext package org.eclipse.xtext.example.parser.packrat.consumers; import org.eclipse.emf.ecore.EObject; -import org.eclipse.xtext.parser.packrat.ICharSequenceWithOffset; -import org.eclipse.xtext.parser.packrat.IHiddenTokenHandler; -import org.eclipse.xtext.parser.packrat.IMarkerFactory; 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.consumers.INonTerminalConsumerConfiguration; import org.eclipse.xtext.parser.packrat.consumers.ConsumeResult; 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.FowlerDslGrammarAccess; import org.eclipse.xtext.example.services.FowlerDslGrammarAccess.CommandElements; @@ -30,10 +26,8 @@ public final class FowlerDslCommandConsumer extends NonTerminalConsumer { private ISequenceMatcher ruleCall$5$Delimiter; - public FowlerDslCommandConsumer(ICharSequenceWithOffset input, IMarkerFactory markerFactory, - IParsedTokenAcceptor tokenAcceptor, IHiddenTokenHandler hiddenTokenHandler, IConsumerUtility consumerUtil, - ITerminalConsumer[] hiddenTokens) { - super(input, markerFactory, tokenAcceptor, hiddenTokenHandler, consumerUtil, hiddenTokens); + public FowlerDslCommandConsumer(INonTerminalConsumerConfiguration configuration, ITerminalConsumer[] hiddenTokens) { + super(configuration, hiddenTokens); ruleCall$3$Delimiter = ISequenceMatcher.Factory.nullMatcher(); ruleCall$5$Delimiter = ISequenceMatcher.Factory.nullMatcher(); } diff --git a/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/FowlerDslEventConsumer.java b/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/FowlerDslEventConsumer.java index ca0e92f..b2dc7c5 100644 --- a/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/FowlerDslEventConsumer.java +++ b/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/FowlerDslEventConsumer.java @@ -4,17 +4,13 @@ Generated with Xtext package org.eclipse.xtext.example.parser.packrat.consumers; import org.eclipse.emf.ecore.EObject; -import org.eclipse.xtext.parser.packrat.ICharSequenceWithOffset; -import org.eclipse.xtext.parser.packrat.IHiddenTokenHandler; -import org.eclipse.xtext.parser.packrat.IMarkerFactory; 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.consumers.INonTerminalConsumerConfiguration; import org.eclipse.xtext.parser.packrat.consumers.ConsumeResult; 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.FowlerDslGrammarAccess; import org.eclipse.xtext.example.services.FowlerDslGrammarAccess.EventElements; @@ -32,10 +28,8 @@ public final class FowlerDslEventConsumer extends NonTerminalConsumer { private ISequenceMatcher ruleCall$8$Delimiter; - public FowlerDslEventConsumer(ICharSequenceWithOffset input, IMarkerFactory markerFactory, - IParsedTokenAcceptor tokenAcceptor, IHiddenTokenHandler hiddenTokenHandler, IConsumerUtility consumerUtil, - ITerminalConsumer[] hiddenTokens) { - super(input, markerFactory, tokenAcceptor, hiddenTokenHandler, consumerUtil, hiddenTokens); + public FowlerDslEventConsumer(INonTerminalConsumerConfiguration configuration, ITerminalConsumer[] hiddenTokens) { + super(configuration, hiddenTokens); keyword$4$Delimiter = ICharacterClass.Factory.nullClass(); ruleCall$6$Delimiter = ISequenceMatcher.Factory.nullMatcher(); ruleCall$8$Delimiter = ISequenceMatcher.Factory.nullMatcher(); diff --git a/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/FowlerDslStateConsumer.java b/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/FowlerDslStateConsumer.java index 2314af9..90e7fcb 100644 --- a/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/FowlerDslStateConsumer.java +++ b/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/FowlerDslStateConsumer.java @@ -4,17 +4,13 @@ Generated with Xtext package org.eclipse.xtext.example.parser.packrat.consumers; import org.eclipse.emf.ecore.EObject; -import org.eclipse.xtext.parser.packrat.ICharSequenceWithOffset; -import org.eclipse.xtext.parser.packrat.IHiddenTokenHandler; -import org.eclipse.xtext.parser.packrat.IMarkerFactory; 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.consumers.INonTerminalConsumerConfiguration; import org.eclipse.xtext.parser.packrat.consumers.ConsumeResult; 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.FowlerDslGrammarAccess; import org.eclipse.xtext.example.services.FowlerDslGrammarAccess.StateElements; @@ -42,10 +38,8 @@ public final class FowlerDslStateConsumer extends NonTerminalConsumer { private ISequenceMatcher ruleCall$7$Delimiter; - public FowlerDslStateConsumer(ICharSequenceWithOffset input, IMarkerFactory markerFactory, - IParsedTokenAcceptor tokenAcceptor, IHiddenTokenHandler hiddenTokenHandler, IConsumerUtility consumerUtil, - ITerminalConsumer[] hiddenTokens) { - super(input, markerFactory, tokenAcceptor, hiddenTokenHandler, consumerUtil, hiddenTokens); + public FowlerDslStateConsumer(INonTerminalConsumerConfiguration configuration, ITerminalConsumer[] hiddenTokens) { + super(configuration, hiddenTokens); crossReference$14$Delimiter = ISequenceMatcher.Factory.nullMatcher(); keyword$5$Delimiter = ICharacterClass.Factory.nullClass(); keyword$11$Delimiter = ICharacterClass.Factory.nullClass(); diff --git a/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/FowlerDslStatemachineConsumer.java b/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/FowlerDslStatemachineConsumer.java index b7fb025..85167d0 100644 --- a/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/FowlerDslStatemachineConsumer.java +++ b/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/FowlerDslStatemachineConsumer.java @@ -4,17 +4,13 @@ Generated with Xtext package org.eclipse.xtext.example.parser.packrat.consumers; import org.eclipse.emf.ecore.EObject; -import org.eclipse.xtext.parser.packrat.ICharSequenceWithOffset; -import org.eclipse.xtext.parser.packrat.IHiddenTokenHandler; -import org.eclipse.xtext.parser.packrat.IMarkerFactory; 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.consumers.INonTerminalConsumerConfiguration; import org.eclipse.xtext.parser.packrat.consumers.ConsumeResult; 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.FowlerDslGrammarAccess; import org.eclipse.xtext.example.services.FowlerDslGrammarAccess.StatemachineElements; @@ -38,10 +34,8 @@ public final class FowlerDslStatemachineConsumer extends NonTerminalConsumer { private ICharacterClass keyword$7$Delimiter; - public FowlerDslStatemachineConsumer(ICharSequenceWithOffset input, IMarkerFactory markerFactory, - IParsedTokenAcceptor tokenAcceptor, IHiddenTokenHandler hiddenTokenHandler, IConsumerUtility consumerUtil, - ITerminalConsumer[] hiddenTokens) { - super(input, markerFactory, tokenAcceptor, hiddenTokenHandler, consumerUtil, hiddenTokens); + public FowlerDslStatemachineConsumer(INonTerminalConsumerConfiguration configuration, ITerminalConsumer[] hiddenTokens) { + super(configuration, hiddenTokens); keyword$10$Delimiter = ICharacterClass.Factory.nullClass(); keyword$11$Delimiter = ICharacterClass.Factory.nullClass(); keyword$14$Delimiter = ICharacterClass.Factory.nullClass(); diff --git a/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/FowlerDslTransitionConsumer.java b/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/FowlerDslTransitionConsumer.java index 6ee42e6..80c0ddf 100644 --- a/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/FowlerDslTransitionConsumer.java +++ b/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/FowlerDslTransitionConsumer.java @@ -4,17 +4,13 @@ Generated with Xtext package org.eclipse.xtext.example.parser.packrat.consumers; import org.eclipse.emf.ecore.EObject; -import org.eclipse.xtext.parser.packrat.ICharSequenceWithOffset; -import org.eclipse.xtext.parser.packrat.IHiddenTokenHandler; -import org.eclipse.xtext.parser.packrat.IMarkerFactory; 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.consumers.INonTerminalConsumerConfiguration; import org.eclipse.xtext.parser.packrat.consumers.ConsumeResult; 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.FowlerDslGrammarAccess; import org.eclipse.xtext.example.services.FowlerDslGrammarAccess.TransitionElements; @@ -32,10 +28,8 @@ public final class FowlerDslTransitionConsumer extends NonTerminalConsumer { private ICharacterClass keyword$6$Delimiter; - public FowlerDslTransitionConsumer(ICharSequenceWithOffset input, IMarkerFactory markerFactory, - IParsedTokenAcceptor tokenAcceptor, IHiddenTokenHandler hiddenTokenHandler, IConsumerUtility consumerUtil, - ITerminalConsumer[] hiddenTokens) { - super(input, markerFactory, tokenAcceptor, hiddenTokenHandler, consumerUtil, hiddenTokens); + public FowlerDslTransitionConsumer(INonTerminalConsumerConfiguration configuration, ITerminalConsumer[] hiddenTokens) { + super(configuration, hiddenTokens); crossReference$4$Delimiter = ISequenceMatcher.Factory.nullMatcher(); crossReference$8$Delimiter = ISequenceMatcher.Factory.nullMatcher(); keyword$6$Delimiter = ICharacterClass.Factory.nullClass(); diff --git a/plugins/org.eclipse.xtext.ui.common/src/org/eclipse/xtext/ui/common/editor/outline/impl/AbstractSemanticModelTransformer.java b/plugins/org.eclipse.xtext.ui.common/src/org/eclipse/xtext/ui/common/editor/outline/impl/AbstractSemanticModelTransformer.java index bddfb73..4fab898 100644 --- a/plugins/org.eclipse.xtext.ui.common/src/org/eclipse/xtext/ui/common/editor/outline/impl/AbstractSemanticModelTransformer.java +++ b/plugins/org.eclipse.xtext.ui.common/src/org/eclipse/xtext/ui/common/editor/outline/impl/AbstractSemanticModelTransformer.java @@ -66,7 +66,7 @@ public abstract class AbstractSemanticModelTransformer implements ISemanticModel protected abstract boolean consumeSemanticNode(EObject semanticNode); - protected String getText(Object object) { + public String getText(Object object) { if (object != null) { EObject eObject = (EObject) object; EClass eClass = eObject.eClass(); diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/packrat/ImportUriTestLanguagePackratParser.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/packrat/ImportUriTestLanguagePackratParser.java index 6860edf..0985711 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/packrat/ImportUriTestLanguagePackratParser.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/packrat/ImportUriTestLanguagePackratParser.java @@ -4,19 +4,13 @@ Generated with Xtext package org.eclipse.xtext.crossrefs.parser.packrat; import org.eclipse.xtext.parser.packrat.AbstractPackratParser; -import org.eclipse.xtext.parser.packrat.ICharSequenceWithOffset; -import org.eclipse.xtext.parser.packrat.IHiddenTokenHandler; -import org.eclipse.xtext.parser.packrat.IMarkerFactory; -import org.eclipse.xtext.parser.packrat.consumers.IConsumerUtility; -import org.eclipse.xtext.parser.packrat.tokens.IParsedTokenAcceptor; +import org.eclipse.xtext.parser.packrat.AbstractParserConfiguration.IInternalParserConfiguration; public class ImportUriTestLanguagePackratParser extends AbstractPackratParser { @Override - protected ImportUriTestLanguageParserConfiguration createParserConfiguration(ICharSequenceWithOffset input, - IMarkerFactory markerFactory, IParsedTokenAcceptor tokenAcceptor, IHiddenTokenHandler hiddenTokenHandler, - IConsumerUtility consumerUtil) { - return new ImportUriTestLanguageParserConfiguration(input, markerFactory, tokenAcceptor, hiddenTokenHandler, consumerUtil); + protected ImportUriTestLanguageParserConfiguration createParserConfiguration(IInternalParserConfiguration configuration) { + return new ImportUriTestLanguageParserConfiguration(configuration); } } diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/packrat/ImportUriTestLanguageParserConfiguration.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/packrat/ImportUriTestLanguageParserConfiguration.java index bbe0e24..a6e8336 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/packrat/ImportUriTestLanguageParserConfiguration.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/packrat/ImportUriTestLanguageParserConfiguration.java @@ -4,13 +4,7 @@ Generated with Xtext package org.eclipse.xtext.crossrefs.parser.packrat; import org.eclipse.xtext.parser.packrat.AbstractParserConfiguration; -import org.eclipse.xtext.parser.packrat.ICharSequenceWithOffset; -import org.eclipse.xtext.parser.packrat.IHiddenTokenHandler; -import org.eclipse.xtext.parser.packrat.IMarkerFactory; -import org.eclipse.xtext.parser.packrat.consumers.IConsumerUtility; -import org.eclipse.xtext.parser.packrat.consumers.INonTerminalConsumer; import org.eclipse.xtext.parser.packrat.consumers.ITerminalConsumer; -import org.eclipse.xtext.parser.packrat.tokens.IParsedTokenAcceptor; import org.eclipse.xtext.builtin.parser.packrat.XtextBuiltinParserConfiguration; @@ -25,6 +19,7 @@ import org.eclipse.xtext.builtin.parser.packrat.consumers.XtextBuiltinSL_COMMENT import org.eclipse.xtext.builtin.parser.packrat.consumers.XtextBuiltinWSConsumer; import org.eclipse.xtext.builtin.parser.packrat.consumers.XtextBuiltinANY_OTHERConsumer; +@SuppressWarnings("unused") public class ImportUriTestLanguageParserConfiguration extends AbstractParserConfiguration { private XtextBuiltinParserConfiguration xtextBuiltinConfiguration; @@ -33,11 +28,9 @@ public class ImportUriTestLanguageParserConfiguration extends AbstractParserConf private ImportUriTestLanguageImportConsumer importConsumer; private ImportUriTestLanguageTypeConsumer typeConsumer; - public ImportUriTestLanguageParserConfiguration(ICharSequenceWithOffset input, IMarkerFactory markerFactory, - IParsedTokenAcceptor tokenAcceptor, IHiddenTokenHandler hiddenTokenHandler, IConsumerUtility consumerUtil) { - super(input, markerFactory, tokenAcceptor, hiddenTokenHandler, consumerUtil); - this.xtextBuiltinConfiguration = new XtextBuiltinParserConfiguration( - input, markerFactory, tokenAcceptor, hiddenTokenHandler, consumerUtil); + public ImportUriTestLanguageParserConfiguration(IInternalParserConfiguration configuration) { + super(configuration); + this.xtextBuiltinConfiguration = new XtextBuiltinParserConfiguration(configuration); } public ImportUriTestLanguageMainConsumer getRootConsumer() { @@ -47,13 +40,13 @@ public class ImportUriTestLanguageParserConfiguration extends AbstractParserConf public void createNonTerminalConsumers() { getXtextBuiltinConfiguration().createNonTerminalConsumers(); mainConsumer = new ImportUriTestLanguageMainConsumer( - getInput(), getMarkerFactory(), getTokenAcceptor(), getHiddenTokenHandler(), getConsumerUtil(), null + this, null ); importConsumer = new ImportUriTestLanguageImportConsumer( - getInput(), getMarkerFactory(), getTokenAcceptor(), getHiddenTokenHandler(), getConsumerUtil(), null + this, null ); typeConsumer = new ImportUriTestLanguageTypeConsumer( - getInput(), getMarkerFactory(), getTokenAcceptor(), getHiddenTokenHandler(), getConsumerUtil(), null + this, null ); } diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/packrat/LangATestLanguagePackratParser.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/packrat/LangATestLanguagePackratParser.java index e4dea87..75ca709 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/packrat/LangATestLanguagePackratParser.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/packrat/LangATestLanguagePackratParser.java @@ -4,19 +4,13 @@ Generated with Xtext package org.eclipse.xtext.crossrefs.parser.packrat; import org.eclipse.xtext.parser.packrat.AbstractPackratParser; -import org.eclipse.xtext.parser.packrat.ICharSequenceWithOffset; -import org.eclipse.xtext.parser.packrat.IHiddenTokenHandler; -import org.eclipse.xtext.parser.packrat.IMarkerFactory; -import org.eclipse.xtext.parser.packrat.consumers.IConsumerUtility; -import org.eclipse.xtext.parser.packrat.tokens.IParsedTokenAcceptor; +import org.eclipse.xtext.parser.packrat.AbstractParserConfiguration.IInternalParserConfiguration; public class LangATestLanguagePackratParser extends AbstractPackratParser { @Override - protected LangATestLanguageParserConfiguration createParserConfiguration(ICharSequenceWithOffset input, - IMarkerFactory markerFactory, IParsedTokenAcceptor tokenAcceptor, IHiddenTokenHandler hiddenTokenHandler, - IConsumerUtility consumerUtil) { - return new LangATestLanguageParserConfiguration(input, markerFactory, tokenAcceptor, hiddenTokenHandler, consumerUtil); + protected LangATestLanguageParserConfiguration createParserConfiguration(IInternalParserConfiguration configuration) { + return new LangATestLanguageParserConfiguration(configuration); } } diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/packrat/LangATestLanguageParserConfiguration.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/packrat/LangATestLanguageParserConfiguration.java index 43f4337..2510d97 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/packrat/LangATestLanguageParserConfiguration.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/packrat/LangATestLanguageParserConfiguration.java @@ -4,13 +4,7 @@ Generated with Xtext package org.eclipse.xtext.crossrefs.parser.packrat; import org.eclipse.xtext.parser.packrat.AbstractParserConfiguration; -import org.eclipse.xtext.parser.packrat.ICharSequenceWithOffset; -import org.eclipse.xtext.parser.packrat.IHiddenTokenHandler; -import org.eclipse.xtext.parser.packrat.IMarkerFactory; -import org.eclipse.xtext.parser.packrat.consumers.IConsumerUtility; -import org.eclipse.xtext.parser.packrat.consumers.INonTerminalConsumer; import org.eclipse.xtext.parser.packrat.consumers.ITerminalConsumer; -import org.eclipse.xtext.parser.packrat.tokens.IParsedTokenAcceptor; import org.eclipse.xtext.builtin.parser.packrat.XtextBuiltinParserConfiguration; @@ -25,6 +19,7 @@ import org.eclipse.xtext.builtin.parser.packrat.consumers.XtextBuiltinSL_COMMENT import org.eclipse.xtext.builtin.parser.packrat.consumers.XtextBuiltinWSConsumer; import org.eclipse.xtext.builtin.parser.packrat.consumers.XtextBuiltinANY_OTHERConsumer; +@SuppressWarnings("unused") public class LangATestLanguageParserConfiguration extends AbstractParserConfiguration { private XtextBuiltinParserConfiguration xtextBuiltinConfiguration; @@ -33,11 +28,9 @@ public class LangATestLanguageParserConfiguration extends AbstractParserConfigur private LangATestLanguageImportConsumer importConsumer; private LangATestLanguageTypeConsumer typeConsumer; - public LangATestLanguageParserConfiguration(ICharSequenceWithOffset input, IMarkerFactory markerFactory, - IParsedTokenAcceptor tokenAcceptor, IHiddenTokenHandler hiddenTokenHandler, IConsumerUtility consumerUtil) { - super(input, markerFactory, tokenAcceptor, hiddenTokenHandler, consumerUtil); - this.xtextBuiltinConfiguration = new XtextBuiltinParserConfiguration( - input, markerFactory, tokenAcceptor, hiddenTokenHandler, consumerUtil); + public LangATestLanguageParserConfiguration(IInternalParserConfiguration configuration) { + super(configuration); + this.xtextBuiltinConfiguration = new XtextBuiltinParserConfiguration(configuration); } public LangATestLanguageMainConsumer getRootConsumer() { @@ -47,13 +40,13 @@ public class LangATestLanguageParserConfiguration extends AbstractParserConfigur public void createNonTerminalConsumers() { getXtextBuiltinConfiguration().createNonTerminalConsumers(); mainConsumer = new LangATestLanguageMainConsumer( - getInput(), getMarkerFactory(), getTokenAcceptor(), getHiddenTokenHandler(), getConsumerUtil(), null + this, null ); importConsumer = new LangATestLanguageImportConsumer( - getInput(), getMarkerFactory(), getTokenAcceptor(), getHiddenTokenHandler(), getConsumerUtil(), null + this, null ); typeConsumer = new LangATestLanguageTypeConsumer( - getInput(), getMarkerFactory(), getTokenAcceptor(), getHiddenTokenHandler(), getConsumerUtil(), null + this, null ); } diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/packrat/consumers/ImportUriTestLanguageImportConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/packrat/consumers/ImportUriTestLanguageImportConsumer.java index a65ac2a..69e8105 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/packrat/consumers/ImportUriTestLanguageImportConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/packrat/consumers/ImportUriTestLanguageImportConsumer.java @@ -4,17 +4,13 @@ Generated with Xtext package org.eclipse.xtext.crossrefs.parser.packrat.consumers; import org.eclipse.emf.ecore.EObject; -import org.eclipse.xtext.parser.packrat.ICharSequenceWithOffset; -import org.eclipse.xtext.parser.packrat.IHiddenTokenHandler; -import org.eclipse.xtext.parser.packrat.IMarkerFactory; 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.consumers.INonTerminalConsumerConfiguration; import org.eclipse.xtext.parser.packrat.consumers.ConsumeResult; 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.crossrefs.services.ImportUriTestLanguageGrammarAccess; import org.eclipse.xtext.crossrefs.services.ImportUriTestLanguageGrammarAccess.ImportElements; @@ -30,10 +26,8 @@ public final class ImportUriTestLanguageImportConsumer extends NonTerminalConsum private ISequenceMatcher ruleCall$4$Delimiter; - public ImportUriTestLanguageImportConsumer(ICharSequenceWithOffset input, IMarkerFactory markerFactory, - IParsedTokenAcceptor tokenAcceptor, IHiddenTokenHandler hiddenTokenHandler, IConsumerUtility consumerUtil, - ITerminalConsumer[] hiddenTokens) { - super(input, markerFactory, tokenAcceptor, hiddenTokenHandler, consumerUtil, hiddenTokens); + public ImportUriTestLanguageImportConsumer(INonTerminalConsumerConfiguration configuration, ITerminalConsumer[] hiddenTokens) { + super(configuration, hiddenTokens); keyword$2$Delimiter = ICharacterClass.Factory.nullClass(); ruleCall$4$Delimiter = ISequenceMatcher.Factory.nullMatcher(); } diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/packrat/consumers/ImportUriTestLanguageMainConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/packrat/consumers/ImportUriTestLanguageMainConsumer.java index 70035ad..a4b91f0 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/packrat/consumers/ImportUriTestLanguageMainConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/packrat/consumers/ImportUriTestLanguageMainConsumer.java @@ -4,17 +4,13 @@ Generated with Xtext package org.eclipse.xtext.crossrefs.parser.packrat.consumers; import org.eclipse.emf.ecore.EObject; -import org.eclipse.xtext.parser.packrat.ICharSequenceWithOffset; -import org.eclipse.xtext.parser.packrat.IHiddenTokenHandler; -import org.eclipse.xtext.parser.packrat.IMarkerFactory; 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.consumers.INonTerminalConsumerConfiguration; import org.eclipse.xtext.parser.packrat.consumers.ConsumeResult; 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.crossrefs.services.ImportUriTestLanguageGrammarAccess; import org.eclipse.xtext.crossrefs.services.ImportUriTestLanguageGrammarAccess.MainElements; @@ -28,10 +24,8 @@ public final class ImportUriTestLanguageMainConsumer extends NonTerminalConsumer private ImportUriTestLanguageImportConsumer importConsumer; private ImportUriTestLanguageTypeConsumer typeConsumer; - public ImportUriTestLanguageMainConsumer(ICharSequenceWithOffset input, IMarkerFactory markerFactory, - IParsedTokenAcceptor tokenAcceptor, IHiddenTokenHandler hiddenTokenHandler, IConsumerUtility consumerUtil, - ITerminalConsumer[] hiddenTokens) { - super(input, markerFactory, tokenAcceptor, hiddenTokenHandler, consumerUtil, hiddenTokens); + public ImportUriTestLanguageMainConsumer(INonTerminalConsumerConfiguration configuration, ITerminalConsumer[] hiddenTokens) { + super(configuration, hiddenTokens); } protected int doConsume() throws Exception { diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/packrat/consumers/ImportUriTestLanguageTypeConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/packrat/consumers/ImportUriTestLanguageTypeConsumer.java index 97b4402..f58f910 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/packrat/consumers/ImportUriTestLanguageTypeConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/packrat/consumers/ImportUriTestLanguageTypeConsumer.java @@ -4,17 +4,13 @@ Generated with Xtext package org.eclipse.xtext.crossrefs.parser.packrat.consumers; import org.eclipse.emf.ecore.EObject; -import org.eclipse.xtext.parser.packrat.ICharSequenceWithOffset; -import org.eclipse.xtext.parser.packrat.IHiddenTokenHandler; -import org.eclipse.xtext.parser.packrat.IMarkerFactory; 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.consumers.INonTerminalConsumerConfiguration; import org.eclipse.xtext.parser.packrat.consumers.ConsumeResult; 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.crossrefs.services.ImportUriTestLanguageGrammarAccess; import org.eclipse.xtext.crossrefs.services.ImportUriTestLanguageGrammarAccess.TypeElements; @@ -34,10 +30,8 @@ public final class ImportUriTestLanguageTypeConsumer extends NonTerminalConsumer private ISequenceMatcher ruleCall$6$Delimiter; - public ImportUriTestLanguageTypeConsumer(ICharSequenceWithOffset input, IMarkerFactory markerFactory, - IParsedTokenAcceptor tokenAcceptor, IHiddenTokenHandler hiddenTokenHandler, IConsumerUtility consumerUtil, - ITerminalConsumer[] hiddenTokens) { - super(input, markerFactory, tokenAcceptor, hiddenTokenHandler, consumerUtil, hiddenTokens); + public ImportUriTestLanguageTypeConsumer(INonTerminalConsumerConfiguration configuration, ITerminalConsumer[] hiddenTokens) { + super(configuration, hiddenTokens); crossReference$9$Delimiter = ISequenceMatcher.Factory.nullMatcher(); keyword$4$Delimiter = ICharacterClass.Factory.nullClass(); keyword$7$Delimiter = ICharacterClass.Factory.nullClass(); diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/packrat/consumers/LangATestLanguageImportConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/packrat/consumers/LangATestLanguageImportConsumer.java index 989a9c3..ae958bf 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/packrat/consumers/LangATestLanguageImportConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/packrat/consumers/LangATestLanguageImportConsumer.java @@ -4,17 +4,13 @@ Generated with Xtext package org.eclipse.xtext.crossrefs.parser.packrat.consumers; import org.eclipse.emf.ecore.EObject; -import org.eclipse.xtext.parser.packrat.ICharSequenceWithOffset; -import org.eclipse.xtext.parser.packrat.IHiddenTokenHandler; -import org.eclipse.xtext.parser.packrat.IMarkerFactory; 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.consumers.INonTerminalConsumerConfiguration; import org.eclipse.xtext.parser.packrat.consumers.ConsumeResult; 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.crossrefs.services.LangATestLanguageGrammarAccess; import org.eclipse.xtext.crossrefs.services.LangATestLanguageGrammarAccess.ImportElements; @@ -30,10 +26,8 @@ public final class LangATestLanguageImportConsumer extends NonTerminalConsumer { private ISequenceMatcher ruleCall$4$Delimiter; - public LangATestLanguageImportConsumer(ICharSequenceWithOffset input, IMarkerFactory markerFactory, - IParsedTokenAcceptor tokenAcceptor, IHiddenTokenHandler hiddenTokenHandler, IConsumerUtility consumerUtil, - ITerminalConsumer[] hiddenTokens) { - super(input, markerFactory, tokenAcceptor, hiddenTokenHandler, consumerUtil, hiddenTokens); + public LangATestLanguageImportConsumer(INonTerminalConsumerConfiguration configuration, ITerminalConsumer[] hiddenTokens) { + super(configuration, hiddenTokens); keyword$2$Delimiter = ICharacterClass.Factory.nullClass(); ruleCall$4$Delimiter = ISequenceMatcher.Factory.nullMatcher(); } diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/packrat/consumers/LangATestLanguageMainConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/packrat/consumers/LangATestLanguageMainConsumer.java index 052eb1e..dd2a909 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/packrat/consumers/LangATestLanguageMainConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/packrat/consumers/LangATestLanguageMainConsumer.java @@ -4,17 +4,13 @@ Generated with Xtext package org.eclipse.xtext.crossrefs.parser.packrat.consumers; import org.eclipse.emf.ecore.EObject; -import org.eclipse.xtext.parser.packrat.ICharSequenceWithOffset; -import org.eclipse.xtext.parser.packrat.IHiddenTokenHandler; -import org.eclipse.xtext.parser.packrat.IMarkerFactory; 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.consumers.INonTerminalConsumerConfiguration; import org.eclipse.xtext.parser.packrat.consumers.ConsumeResult; 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.crossrefs.services.LangATestLanguageGrammarAccess; import org.eclipse.xtext.crossrefs.services.LangATestLanguageGrammarAccess.MainElements; @@ -28,10 +24,8 @@ public final class LangATestLanguageMainConsumer extends NonTerminalConsumer { private LangATestLanguageImportConsumer importConsumer; private LangATestLanguageTypeConsumer typeConsumer; - public LangATestLanguageMainConsumer(ICharSequenceWithOffset input, IMarkerFactory markerFactory, - IParsedTokenAcceptor tokenAcceptor, IHiddenTokenHandler hiddenTokenHandler, IConsumerUtility consumerUtil, - ITerminalConsumer[] hiddenTokens) { - super(input, markerFactory, tokenAcceptor, hiddenTokenHandler, consumerUtil, hiddenTokens); + public LangATestLanguageMainConsumer(INonTerminalConsumerConfiguration configuration, ITerminalConsumer[] hiddenTokens) { + super(configuration, hiddenTokens); } protected int doConsume() throws Exception { diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/packrat/consumers/LangATestLanguageTypeConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/packrat/consumers/LangATestLanguageTypeConsumer.java index 4b08e97..efbb5f9 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/packrat/consumers/LangATestLanguageTypeConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/packrat/consumers/LangATestLanguageTypeConsumer.java @@ -4,17 +4,13 @@ Generated with Xtext package org.eclipse.xtext.crossrefs.parser.packrat.consumers; import org.eclipse.emf.ecore.EObject; -import org.eclipse.xtext.parser.packrat.ICharSequenceWithOffset; -import org.eclipse.xtext.parser.packrat.IHiddenTokenHandler; -import org.eclipse.xtext.parser.packrat.IMarkerFactory; 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.consumers.INonTerminalConsumerConfiguration; import org.eclipse.xtext.parser.packrat.consumers.ConsumeResult; 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.crossrefs.services.LangATestLanguageGrammarAccess; import org.eclipse.xtext.crossrefs.services.LangATestLanguageGrammarAccess.TypeElements; @@ -34,10 +30,8 @@ public final class LangATestLanguageTypeConsumer extends NonTerminalConsumer { private ISequenceMatcher ruleCall$6$Delimiter; - public LangATestLanguageTypeConsumer(ICharSequenceWithOffset input, IMarkerFactory markerFactory, - IParsedTokenAcceptor tokenAcceptor, IHiddenTokenHandler hiddenTokenHandler, IConsumerUtility consumerUtil, - ITerminalConsumer[] hiddenTokens) { - super(input, markerFactory, tokenAcceptor, hiddenTokenHandler, consumerUtil, hiddenTokens); + public LangATestLanguageTypeConsumer(INonTerminalConsumerConfiguration configuration, ITerminalConsumer[] hiddenTokens) { + super(configuration, hiddenTokens); crossReference$9$Delimiter = ISequenceMatcher.Factory.nullMatcher(); keyword$4$Delimiter = ICharacterClass.Factory.nullClass(); keyword$7$Delimiter = ICharacterClass.Factory.nullClass(); diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/dummy/parser/packrat/DummyTestLanguagePackratParser.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/dummy/parser/packrat/DummyTestLanguagePackratParser.java index b15c0b2..cfabe9b 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/dummy/parser/packrat/DummyTestLanguagePackratParser.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/dummy/parser/packrat/DummyTestLanguagePackratParser.java @@ -4,19 +4,13 @@ Generated with Xtext package org.eclipse.xtext.dummy.parser.packrat; import org.eclipse.xtext.parser.packrat.AbstractPackratParser; -import org.eclipse.xtext.parser.packrat.ICharSequenceWithOffset; -import org.eclipse.xtext.parser.packrat.IHiddenTokenHandler; -import org.eclipse.xtext.parser.packrat.IMarkerFactory; -import org.eclipse.xtext.parser.packrat.consumers.IConsumerUtility; -import org.eclipse.xtext.parser.packrat.tokens.IParsedTokenAcceptor; +import org.eclipse.xtext.parser.packrat.AbstractParserConfiguration.IInternalParserConfiguration; public class DummyTestLanguagePackratParser extends AbstractPackratParser { @Override - protected DummyTestLanguageParserConfiguration createParserConfiguration(ICharSequenceWithOffset input, - IMarkerFactory markerFactory, IParsedTokenAcceptor tokenAcceptor, IHiddenTokenHandler hiddenTokenHandler, - IConsumerUtility consumerUtil) { - return new DummyTestLanguageParserConfiguration(input, markerFactory, tokenAcceptor, hiddenTokenHandler, consumerUtil); + protected DummyTestLanguageParserConfiguration createParserConfiguration(IInternalParserConfiguration configuration) { + return new DummyTestLanguageParserConfiguration(configuration); } } diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/dummy/parser/packrat/DummyTestLanguageParserConfiguration.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/dummy/parser/packrat/DummyTestLanguageParserConfiguration.java index e476dfc..eeabe4a 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/dummy/parser/packrat/DummyTestLanguageParserConfiguration.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/dummy/parser/packrat/DummyTestLanguageParserConfiguration.java @@ -4,13 +4,7 @@ Generated with Xtext package org.eclipse.xtext.dummy.parser.packrat; import org.eclipse.xtext.parser.packrat.AbstractParserConfiguration; -import org.eclipse.xtext.parser.packrat.ICharSequenceWithOffset; -import org.eclipse.xtext.parser.packrat.IHiddenTokenHandler; -import org.eclipse.xtext.parser.packrat.IMarkerFactory; -import org.eclipse.xtext.parser.packrat.consumers.IConsumerUtility; -import org.eclipse.xtext.parser.packrat.consumers.INonTerminalConsumer; import org.eclipse.xtext.parser.packrat.consumers.ITerminalConsumer; -import org.eclipse.xtext.parser.packrat.tokens.IParsedTokenAcceptor; import org.eclipse.xtext.builtin.parser.packrat.XtextBuiltinParserConfiguration; @@ -24,6 +18,7 @@ import org.eclipse.xtext.builtin.parser.packrat.consumers.XtextBuiltinSL_COMMENT import org.eclipse.xtext.builtin.parser.packrat.consumers.XtextBuiltinWSConsumer; import org.eclipse.xtext.builtin.parser.packrat.consumers.XtextBuiltinANY_OTHERConsumer; +@SuppressWarnings("unused") public class DummyTestLanguageParserConfiguration extends AbstractParserConfiguration { private XtextBuiltinParserConfiguration xtextBuiltinConfiguration; @@ -31,11 +26,9 @@ public class DummyTestLanguageParserConfiguration extends AbstractParserConfigur private DummyTestLanguageModelConsumer modelConsumer; private DummyTestLanguageElementConsumer elementConsumer; - public DummyTestLanguageParserConfiguration(ICharSequenceWithOffset input, IMarkerFactory markerFactory, - IParsedTokenAcceptor tokenAcceptor, IHiddenTokenHandler hiddenTokenHandler, IConsumerUtility consumerUtil) { - super(input, markerFactory, tokenAcceptor, hiddenTokenHandler, consumerUtil); - this.xtextBuiltinConfiguration = new XtextBuiltinParserConfiguration( - input, markerFactory, tokenAcceptor, hiddenTokenHandler, consumerUtil); + public DummyTestLanguageParserConfiguration(IInternalParserConfiguration configuration) { + super(configuration); + this.xtextBuiltinConfiguration = new XtextBuiltinParserConfiguration(configuration); } public DummyTestLanguageModelConsumer getRootConsumer() { @@ -45,10 +38,10 @@ public class DummyTestLanguageParserConfiguration extends AbstractParserConfigur public void createNonTerminalConsumers() { getXtextBuiltinConfiguration().createNonTerminalConsumers(); modelConsumer = new DummyTestLanguageModelConsumer( - getInput(), getMarkerFactory(), getTokenAcceptor(), getHiddenTokenHandler(), getConsumerUtil(), null + this, null ); elementConsumer = new DummyTestLanguageElementConsumer( - getInput(), getMarkerFactory(), getTokenAcceptor(), getHiddenTokenHandler(), getConsumerUtil(), null + this, null ); } diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/dummy/parser/packrat/consumers/DummyTestLanguageElementConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/dummy/parser/packrat/consumers/DummyTestLanguageElementConsumer.java index 0eb240b..8887f5c 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/dummy/parser/packrat/consumers/DummyTestLanguageElementConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/dummy/parser/packrat/consumers/DummyTestLanguageElementConsumer.java @@ -4,17 +4,13 @@ Generated with Xtext package org.eclipse.xtext.dummy.parser.packrat.consumers; import org.eclipse.emf.ecore.EObject; -import org.eclipse.xtext.parser.packrat.ICharSequenceWithOffset; -import org.eclipse.xtext.parser.packrat.IHiddenTokenHandler; -import org.eclipse.xtext.parser.packrat.IMarkerFactory; 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.consumers.INonTerminalConsumerConfiguration; import org.eclipse.xtext.parser.packrat.consumers.ConsumeResult; 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.dummy.services.DummyTestLanguageGrammarAccess; import org.eclipse.xtext.dummy.services.DummyTestLanguageGrammarAccess.ElementElements; @@ -38,10 +34,8 @@ public final class DummyTestLanguageElementConsumer extends NonTerminalConsumer private ISequenceMatcher ruleCall$11$Delimiter; - public DummyTestLanguageElementConsumer(ICharSequenceWithOffset input, IMarkerFactory markerFactory, - IParsedTokenAcceptor tokenAcceptor, IHiddenTokenHandler hiddenTokenHandler, IConsumerUtility consumerUtil, - ITerminalConsumer[] hiddenTokens) { - super(input, markerFactory, tokenAcceptor, hiddenTokenHandler, consumerUtil, hiddenTokens); + public DummyTestLanguageElementConsumer(INonTerminalConsumerConfiguration configuration, ITerminalConsumer[] hiddenTokens) { + super(configuration, hiddenTokens); keyword$6$Delimiter = ICharacterClass.Factory.nullClass(); keyword$7$Delimiter = ICharacterClass.Factory.nullClass(); keyword$12$Delimiter = ICharacterClass.Factory.nullClass(); diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/dummy/parser/packrat/consumers/DummyTestLanguageModelConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/dummy/parser/packrat/consumers/DummyTestLanguageModelConsumer.java index 4f1812b..7257c99 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/dummy/parser/packrat/consumers/DummyTestLanguageModelConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/dummy/parser/packrat/consumers/DummyTestLanguageModelConsumer.java @@ -4,17 +4,13 @@ Generated with Xtext package org.eclipse.xtext.dummy.parser.packrat.consumers; import org.eclipse.emf.ecore.EObject; -import org.eclipse.xtext.parser.packrat.ICharSequenceWithOffset; -import org.eclipse.xtext.parser.packrat.IHiddenTokenHandler; -import org.eclipse.xtext.parser.packrat.IMarkerFactory; 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.consumers.INonTerminalConsumerConfiguration; import org.eclipse.xtext.parser.packrat.consumers.ConsumeResult; 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.dummy.services.DummyTestLanguageGrammarAccess; import org.eclipse.xtext.dummy.services.DummyTestLanguageGrammarAccess.ModelElements; @@ -26,10 +22,8 @@ public final class DummyTestLanguageModelConsumer extends NonTerminalConsumer { private DummyTestLanguageElementConsumer elementConsumer; - public DummyTestLanguageModelConsumer(ICharSequenceWithOffset input, IMarkerFactory markerFactory, - IParsedTokenAcceptor tokenAcceptor, IHiddenTokenHandler hiddenTokenHandler, IConsumerUtility consumerUtil, - ITerminalConsumer[] hiddenTokens) { - super(input, markerFactory, tokenAcceptor, hiddenTokenHandler, consumerUtil, hiddenTokens); + public DummyTestLanguageModelConsumer(INonTerminalConsumerConfiguration configuration, ITerminalConsumer[] hiddenTokens) { + super(configuration, hiddenTokens); } protected int doConsume() throws Exception { diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/packrat/AbstractTestLanguagePackratParser.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/packrat/AbstractTestLanguagePackratParser.java index 433c6a7..3b13481 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/packrat/AbstractTestLanguagePackratParser.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/packrat/AbstractTestLanguagePackratParser.java @@ -4,19 +4,13 @@ Generated with Xtext package org.eclipse.xtext.grammarinheritance.parser.packrat; import org.eclipse.xtext.parser.packrat.AbstractPackratParser; -import org.eclipse.xtext.parser.packrat.ICharSequenceWithOffset; -import org.eclipse.xtext.parser.packrat.IHiddenTokenHandler; -import org.eclipse.xtext.parser.packrat.IMarkerFactory; -import org.eclipse.xtext.parser.packrat.consumers.IConsumerUtility; -import org.eclipse.xtext.parser.packrat.tokens.IParsedTokenAcceptor; +import org.eclipse.xtext.parser.packrat.AbstractParserConfiguration.IInternalParserConfiguration; public class AbstractTestLanguagePackratParser extends AbstractPackratParser { @Override - protected AbstractTestLanguageParserConfiguration createParserConfiguration(ICharSequenceWithOffset input, - IMarkerFactory markerFactory, IParsedTokenAcceptor tokenAcceptor, IHiddenTokenHandler hiddenTokenHandler, - IConsumerUtility consumerUtil) { - return new AbstractTestLanguageParserConfiguration(input, markerFactory, tokenAcceptor, hiddenTokenHandler, consumerUtil); + protected AbstractTestLanguageParserConfiguration createParserConfiguration(IInternalParserConfiguration configuration) { + return new AbstractTestLanguageParserConfiguration(configuration); } } diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/packrat/AbstractTestLanguageParserConfiguration.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/packrat/AbstractTestLanguageParserConfiguration.java index 99426f9..3f12cd0 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/packrat/AbstractTestLanguageParserConfiguration.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/packrat/AbstractTestLanguageParserConfiguration.java @@ -4,13 +4,7 @@ Generated with Xtext package org.eclipse.xtext.grammarinheritance.parser.packrat; import org.eclipse.xtext.parser.packrat.AbstractParserConfiguration; -import org.eclipse.xtext.parser.packrat.ICharSequenceWithOffset; -import org.eclipse.xtext.parser.packrat.IHiddenTokenHandler; -import org.eclipse.xtext.parser.packrat.IMarkerFactory; -import org.eclipse.xtext.parser.packrat.consumers.IConsumerUtility; -import org.eclipse.xtext.parser.packrat.consumers.INonTerminalConsumer; import org.eclipse.xtext.parser.packrat.consumers.ITerminalConsumer; -import org.eclipse.xtext.parser.packrat.tokens.IParsedTokenAcceptor; import org.eclipse.xtext.builtin.parser.packrat.XtextBuiltinParserConfiguration; @@ -24,6 +18,7 @@ import org.eclipse.xtext.builtin.parser.packrat.consumers.XtextBuiltinSL_COMMENT import org.eclipse.xtext.builtin.parser.packrat.consumers.XtextBuiltinWSConsumer; import org.eclipse.xtext.builtin.parser.packrat.consumers.XtextBuiltinANY_OTHERConsumer; +@SuppressWarnings("unused") public class AbstractTestLanguageParserConfiguration extends AbstractParserConfiguration { private XtextBuiltinParserConfiguration xtextBuiltinConfiguration; @@ -32,11 +27,9 @@ public class AbstractTestLanguageParserConfiguration extends AbstractParserConfi private AbstractTestLanguageREALConsumer realConsumer; private AbstractTestLanguageIDConsumer idConsumer; - public AbstractTestLanguageParserConfiguration(ICharSequenceWithOffset input, IMarkerFactory markerFactory, - IParsedTokenAcceptor tokenAcceptor, IHiddenTokenHandler hiddenTokenHandler, IConsumerUtility consumerUtil) { - super(input, markerFactory, tokenAcceptor, hiddenTokenHandler, consumerUtil); - this.xtextBuiltinConfiguration = new XtextBuiltinParserConfiguration( - input, markerFactory, tokenAcceptor, hiddenTokenHandler, consumerUtil); + public AbstractTestLanguageParserConfiguration(IInternalParserConfiguration configuration) { + super(configuration); + this.xtextBuiltinConfiguration = new XtextBuiltinParserConfiguration(configuration); } public AbstractTestLanguageInheritedParserRuleConsumer getRootConsumer() { @@ -46,14 +39,14 @@ public class AbstractTestLanguageParserConfiguration extends AbstractParserConfi public void createNonTerminalConsumers() { getXtextBuiltinConfiguration().createNonTerminalConsumers(); inheritedParserRuleConsumer = new AbstractTestLanguageInheritedParserRuleConsumer( - getInput(), getMarkerFactory(), getTokenAcceptor(), getHiddenTokenHandler(), getConsumerUtil(), null + this, null ); } public void createTerminalConsumers() { getXtextBuiltinConfiguration().createTerminalConsumers(); - realConsumer = new AbstractTestLanguageREALConsumer(getInput(), getMarkerFactory(), getTokenAcceptor()); - idConsumer = new AbstractTestLanguageIDConsumer(getInput(), getMarkerFactory(), getTokenAcceptor()); + realConsumer = new AbstractTestLanguageREALConsumer(this); + idConsumer = new AbstractTestLanguageIDConsumer(this); } public void configureConsumers() { diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/packrat/ConcreteTestLanguagePackratParser.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/packrat/ConcreteTestLanguagePackratParser.java index 47a0f12..216a2b6 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/packrat/ConcreteTestLanguagePackratParser.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/packrat/ConcreteTestLanguagePackratParser.java @@ -4,19 +4,13 @@ Generated with Xtext package org.eclipse.xtext.grammarinheritance.parser.packrat; import org.eclipse.xtext.parser.packrat.AbstractPackratParser; -import org.eclipse.xtext.parser.packrat.ICharSequenceWithOffset; -import org.eclipse.xtext.parser.packrat.IHiddenTokenHandler; -import org.eclipse.xtext.parser.packrat.IMarkerFactory; -import org.eclipse.xtext.parser.packrat.consumers.IConsumerUtility; -import org.eclipse.xtext.parser.packrat.tokens.IParsedTokenAcceptor; +import org.eclipse.xtext.parser.packrat.AbstractParserConfiguration.IInternalParserConfiguration; public class ConcreteTestLanguagePackratParser extends AbstractPackratParser { @Override - protected ConcreteTestLanguageParserConfiguration createParserConfiguration(ICharSequenceWithOffset input, - IMarkerFactory markerFactory, IParsedTokenAcceptor tokenAcceptor, IHiddenTokenHandler hiddenTokenHandler, - IConsumerUtility consumerUtil) { - return new ConcreteTestLanguageParserConfiguration(input, markerFactory, tokenAcceptor, hiddenTokenHandler, consumerUtil); + protected ConcreteTestLanguageParserConfiguration createParserConfiguration(IInternalParserConfiguration configuration) { + return new ConcreteTestLanguageParserConfiguration(configuration); } } diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/packrat/ConcreteTestLanguageParserConfiguration.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/packrat/ConcreteTestLanguageParserConfiguration.java index 811d572..2584d4d 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/packrat/ConcreteTestLanguageParserConfiguration.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/packrat/ConcreteTestLanguageParserConfiguration.java @@ -4,13 +4,7 @@ Generated with Xtext package org.eclipse.xtext.grammarinheritance.parser.packrat; import org.eclipse.xtext.parser.packrat.AbstractParserConfiguration; -import org.eclipse.xtext.parser.packrat.ICharSequenceWithOffset; -import org.eclipse.xtext.parser.packrat.IHiddenTokenHandler; -import org.eclipse.xtext.parser.packrat.IMarkerFactory; -import org.eclipse.xtext.parser.packrat.consumers.IConsumerUtility; -import org.eclipse.xtext.parser.packrat.consumers.INonTerminalConsumer; import org.eclipse.xtext.parser.packrat.consumers.ITerminalConsumer; -import org.eclipse.xtext.parser.packrat.tokens.IParsedTokenAcceptor; import org.eclipse.xtext.grammarinheritance.parser.packrat.AbstractTestLanguageParserConfiguration; @@ -25,17 +19,16 @@ import org.eclipse.xtext.builtin.parser.packrat.consumers.XtextBuiltinSL_COMMENT import org.eclipse.xtext.builtin.parser.packrat.consumers.XtextBuiltinWSConsumer; import org.eclipse.xtext.builtin.parser.packrat.consumers.XtextBuiltinANY_OTHERConsumer; +@SuppressWarnings("unused") public class ConcreteTestLanguageParserConfiguration extends AbstractParserConfiguration { private AbstractTestLanguageParserConfiguration abstractTestLanguageConfiguration; private ConcreteTestLanguageConcreteParserRuleConsumer concreteParserRuleConsumer; - public ConcreteTestLanguageParserConfiguration(ICharSequenceWithOffset input, IMarkerFactory markerFactory, - IParsedTokenAcceptor tokenAcceptor, IHiddenTokenHandler hiddenTokenHandler, IConsumerUtility consumerUtil) { - super(input, markerFactory, tokenAcceptor, hiddenTokenHandler, consumerUtil); - this.abstractTestLanguageConfiguration = new AbstractTestLanguageParserConfiguration( - input, markerFactory, tokenAcceptor, hiddenTokenHandler, consumerUtil); + public ConcreteTestLanguageParserConfiguration(IInternalParserConfiguration configuration) { + super(configuration); + this.abstractTestLanguageConfiguration = new AbstractTestLanguageParserConfiguration(configuration); } public ConcreteTestLanguageConcreteParserRuleConsumer getRootConsumer() { @@ -45,7 +38,7 @@ public class ConcreteTestLanguageParserConfiguration extends AbstractParserConfi public void createNonTerminalConsumers() { getAbstractTestLanguageConfiguration().createNonTerminalConsumers(); concreteParserRuleConsumer = new ConcreteTestLanguageConcreteParserRuleConsumer( - getInput(), getMarkerFactory(), getTokenAcceptor(), getHiddenTokenHandler(), getConsumerUtil(), null + this, null ); } diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/packrat/consumers/AbstractTestLanguageInheritedParserRuleConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/packrat/consumers/AbstractTestLanguageInheritedParserRuleConsumer.java index fa61a54..62881a6 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/packrat/consumers/AbstractTestLanguageInheritedParserRuleConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/packrat/consumers/AbstractTestLanguageInheritedParserRuleConsumer.java @@ -4,17 +4,13 @@ Generated with Xtext package org.eclipse.xtext.grammarinheritance.parser.packrat.consumers; import org.eclipse.emf.ecore.EObject; -import org.eclipse.xtext.parser.packrat.ICharSequenceWithOffset; -import org.eclipse.xtext.parser.packrat.IHiddenTokenHandler; -import org.eclipse.xtext.parser.packrat.IMarkerFactory; 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.consumers.INonTerminalConsumerConfiguration; import org.eclipse.xtext.parser.packrat.consumers.ConsumeResult; 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.grammarinheritance.services.AbstractTestLanguageGrammarAccess; import org.eclipse.xtext.grammarinheritance.services.AbstractTestLanguageGrammarAccess.InheritedParserRuleElements; @@ -30,10 +26,8 @@ public final class AbstractTestLanguageInheritedParserRuleConsumer extends NonTe private ISequenceMatcher ruleCall$4$Delimiter; - public AbstractTestLanguageInheritedParserRuleConsumer(ICharSequenceWithOffset input, IMarkerFactory markerFactory, - IParsedTokenAcceptor tokenAcceptor, IHiddenTokenHandler hiddenTokenHandler, IConsumerUtility consumerUtil, - ITerminalConsumer[] hiddenTokens) { - super(input, markerFactory, tokenAcceptor, hiddenTokenHandler, consumerUtil, hiddenTokens); + public AbstractTestLanguageInheritedParserRuleConsumer(INonTerminalConsumerConfiguration configuration, ITerminalConsumer[] hiddenTokens) { + super(configuration, hiddenTokens); keyword$2$Delimiter = ICharacterClass.Factory.nullClass(); ruleCall$4$Delimiter = ISequenceMatcher.Factory.nullMatcher(); } diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/packrat/consumers/ConcreteTestLanguageConcreteParserRuleConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/packrat/consumers/ConcreteTestLanguageConcreteParserRuleConsumer.java index 0a2a4d9..02105c3 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/packrat/consumers/ConcreteTestLanguageConcreteParserRuleConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/packrat/consumers/ConcreteTestLanguageConcreteParserRuleConsumer.java @@ -4,17 +4,13 @@ Generated with Xtext package org.eclipse.xtext.grammarinheritance.parser.packrat.consumers; import org.eclipse.emf.ecore.EObject; -import org.eclipse.xtext.parser.packrat.ICharSequenceWithOffset; -import org.eclipse.xtext.parser.packrat.IHiddenTokenHandler; -import org.eclipse.xtext.parser.packrat.IMarkerFactory; 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.consumers.INonTerminalConsumerConfiguration; import org.eclipse.xtext.parser.packrat.consumers.ConsumeResult; 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.grammarinheritance.services.ConcreteTestLanguageGrammarAccess; import org.eclipse.xtext.grammarinheritance.services.ConcreteTestLanguageGrammarAccess.ConcreteParserRuleElements; @@ -34,10 +30,8 @@ public final class ConcreteTestLanguageConcreteParserRuleConsumer extends NonTer private ISequenceMatcher ruleCall$6$Delimiter; - public ConcreteTestLanguageConcreteParserRuleConsumer(ICharSequenceWithOffset input, IMarkerFactory markerFactory, - IParsedTokenAcceptor tokenAcceptor, IHiddenTokenHandler hiddenTokenHandler, IConsumerUtility consumerUtil, - ITerminalConsumer[] hiddenTokens) { - super(input, markerFactory, tokenAcceptor, hiddenTokenHandler, consumerUtil, hiddenTokens); + public ConcreteTestLanguageConcreteParserRuleConsumer(INonTerminalConsumerConfiguration configuration, ITerminalConsumer[] hiddenTokens) { + super(configuration, hiddenTokens); keyword$4$Delimiter = ICharacterClass.Factory.nullClass(); keyword$7$Delimiter = ICharacterClass.Factory.nullClass(); ruleCall$6$Delimiter = ISequenceMatcher.Factory.nullMatcher(); diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/packrat/MetamodelRefTestLanguagePackratParser.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/packrat/MetamodelRefTestLanguagePackratParser.java index c178569..4f27412 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/packrat/MetamodelRefTestLanguagePackratParser.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/packrat/MetamodelRefTestLanguagePackratParser.java @@ -4,19 +4,13 @@ Generated with Xtext package org.eclipse.xtext.metamodelreferencing.tests.parser.packrat; import org.eclipse.xtext.parser.packrat.AbstractPackratParser; -import org.eclipse.xtext.parser.packrat.ICharSequenceWithOffset; -import org.eclipse.xtext.parser.packrat.IHiddenTokenHandler; -import org.eclipse.xtext.parser.packrat.IMarkerFactory; -import org.eclipse.xtext.parser.packrat.consumers.IConsumerUtility; -import org.eclipse.xtext.parser.packrat.tokens.IParsedTokenAcceptor; +import org.eclipse.xtext.parser.packrat.AbstractParserConfiguration.IInternalParserConfiguration; public class MetamodelRefTestLanguagePackratParser extends AbstractPackratParser { @Override - protected MetamodelRefTestLanguageParserConfiguration createParserConfiguration(ICharSequenceWithOffset input, - IMarkerFactory markerFactory, IParsedTokenAcceptor tokenAcceptor, IHiddenTokenHandler hiddenTokenHandler, - IConsumerUtility consumerUtil) { - return new MetamodelRefTestLanguageParserConfiguration(input, markerFactory, tokenAcceptor, hiddenTokenHandler, consumerUtil); + protected MetamodelRefTestLanguageParserConfiguration createParserConfiguration(IInternalParserConfiguration configuration) { + return new MetamodelRefTestLanguageParserConfiguration(configuration); } } diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/packrat/MetamodelRefTestLanguageParserConfiguration.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/packrat/MetamodelRefTestLanguageParserConfiguration.java index 31ed698..bd24f15 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/packrat/MetamodelRefTestLanguageParserConfiguration.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/packrat/MetamodelRefTestLanguageParserConfiguration.java @@ -4,13 +4,7 @@ Generated with Xtext package org.eclipse.xtext.metamodelreferencing.tests.parser.packrat; import org.eclipse.xtext.parser.packrat.AbstractParserConfiguration; -import org.eclipse.xtext.parser.packrat.ICharSequenceWithOffset; -import org.eclipse.xtext.parser.packrat.IHiddenTokenHandler; -import org.eclipse.xtext.parser.packrat.IMarkerFactory; -import org.eclipse.xtext.parser.packrat.consumers.IConsumerUtility; -import org.eclipse.xtext.parser.packrat.consumers.INonTerminalConsumer; import org.eclipse.xtext.parser.packrat.consumers.ITerminalConsumer; -import org.eclipse.xtext.parser.packrat.tokens.IParsedTokenAcceptor; import org.eclipse.xtext.builtin.parser.packrat.XtextBuiltinParserConfiguration; @@ -25,6 +19,7 @@ import org.eclipse.xtext.builtin.parser.packrat.consumers.XtextBuiltinSL_COMMENT import org.eclipse.xtext.builtin.parser.packrat.consumers.XtextBuiltinWSConsumer; import org.eclipse.xtext.builtin.parser.packrat.consumers.XtextBuiltinANY_OTHERConsumer; +@SuppressWarnings("unused") public class MetamodelRefTestLanguageParserConfiguration extends AbstractParserConfiguration { private XtextBuiltinParserConfiguration xtextBuiltinConfiguration; @@ -33,11 +28,9 @@ public class MetamodelRefTestLanguageParserConfiguration extends AbstractParserC private MetamodelRefTestLanguageNameRefConsumer nameRefConsumer; private MetamodelRefTestLanguageMyRuleConsumer myRuleConsumer; - public MetamodelRefTestLanguageParserConfiguration(ICharSequenceWithOffset input, IMarkerFactory markerFactory, - IParsedTokenAcceptor tokenAcceptor, IHiddenTokenHandler hiddenTokenHandler, IConsumerUtility consumerUtil) { - super(input, markerFactory, tokenAcceptor, hiddenTokenHandler, consumerUtil); - this.xtextBuiltinConfiguration = new XtextBuiltinParserConfiguration( - input, markerFactory, tokenAcceptor, hiddenTokenHandler, consumerUtil); + public MetamodelRefTestLanguageParserConfiguration(IInternalParserConfiguration configuration) { + super(configuration); + this.xtextBuiltinConfiguration = new XtextBuiltinParserConfiguration(configuration); } public MetamodelRefTestLanguageFooConsumer getRootConsumer() { @@ -47,13 +40,13 @@ public class MetamodelRefTestLanguageParserConfiguration extends AbstractParserC public void createNonTerminalConsumers() { getXtextBuiltinConfiguration().createNonTerminalConsumers(); fooConsumer = new MetamodelRefTestLanguageFooConsumer( - getInput(), getMarkerFactory(), getTokenAcceptor(), getHiddenTokenHandler(), getConsumerUtil(), null + this, null ); nameRefConsumer = new MetamodelRefTestLanguageNameRefConsumer( - getInput(), getMarkerFactory(), getTokenAcceptor(), getHiddenTokenHandler(), getConsumerUtil(), null + this, null ); myRuleConsumer = new MetamodelRefTestLanguageMyRuleConsumer( - getInput(), getMarkerFactory(), getTokenAcceptor(), getHiddenTokenHandler(), getConsumerUtil(), null + this, null ); } diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/packrat/MultiGenMMTestLanguagePackratParser.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/packrat/MultiGenMMTestLanguagePackratParser.java index b6d53bc..9df6390 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/packrat/MultiGenMMTestLanguagePackratParser.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/packrat/MultiGenMMTestLanguagePackratParser.java @@ -4,19 +4,13 @@ Generated with Xtext package org.eclipse.xtext.metamodelreferencing.tests.parser.packrat; import org.eclipse.xtext.parser.packrat.AbstractPackratParser; -import org.eclipse.xtext.parser.packrat.ICharSequenceWithOffset; -import org.eclipse.xtext.parser.packrat.IHiddenTokenHandler; -import org.eclipse.xtext.parser.packrat.IMarkerFactory; -import org.eclipse.xtext.parser.packrat.consumers.IConsumerUtility; -import org.eclipse.xtext.parser.packrat.tokens.IParsedTokenAcceptor; +import org.eclipse.xtext.parser.packrat.AbstractParserConfiguration.IInternalParserConfiguration; public class MultiGenMMTestLanguagePackratParser extends AbstractPackratParser { @Override - protected MultiGenMMTestLanguageParserConfiguration createParserConfiguration(ICharSequenceWithOffset input, - IMarkerFactory markerFactory, IParsedTokenAcceptor tokenAcceptor, IHiddenTokenHandler hiddenTokenHandler, - IConsumerUtility consumerUtil) { - return new MultiGenMMTestLanguageParserConfiguration(input, markerFactory, tokenAcceptor, hiddenTokenHandler, consumerUtil); + protected MultiGenMMTestLanguageParserConfiguration createParserConfiguration(IInternalParserConfiguration configuration) { + return new MultiGenMMTestLanguageParserConfiguration(configuration); } } diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/packrat/MultiGenMMTestLanguageParserConfiguration.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/packrat/MultiGenMMTestLanguageParserConfiguration.java index a9a24c4..76d3825 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/packrat/MultiGenMMTestLanguageParserConfiguration.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/packrat/MultiGenMMTestLanguageParserConfiguration.java @@ -4,13 +4,7 @@ Generated with Xtext package org.eclipse.xtext.metamodelreferencing.tests.parser.packrat; import org.eclipse.xtext.parser.packrat.AbstractParserConfiguration; -import org.eclipse.xtext.parser.packrat.ICharSequenceWithOffset; -import org.eclipse.xtext.parser.packrat.IHiddenTokenHandler; -import org.eclipse.xtext.parser.packrat.IMarkerFactory; -import org.eclipse.xtext.parser.packrat.consumers.IConsumerUtility; -import org.eclipse.xtext.parser.packrat.consumers.INonTerminalConsumer; import org.eclipse.xtext.parser.packrat.consumers.ITerminalConsumer; -import org.eclipse.xtext.parser.packrat.tokens.IParsedTokenAcceptor; import org.eclipse.xtext.builtin.parser.packrat.XtextBuiltinParserConfiguration; @@ -24,6 +18,7 @@ import org.eclipse.xtext.builtin.parser.packrat.consumers.XtextBuiltinSL_COMMENT import org.eclipse.xtext.builtin.parser.packrat.consumers.XtextBuiltinWSConsumer; import org.eclipse.xtext.builtin.parser.packrat.consumers.XtextBuiltinANY_OTHERConsumer; +@SuppressWarnings("unused") public class MultiGenMMTestLanguageParserConfiguration extends AbstractParserConfiguration { private XtextBuiltinParserConfiguration xtextBuiltinConfiguration; @@ -31,11 +26,9 @@ public class MultiGenMMTestLanguageParserConfiguration extends AbstractParserCon private MultiGenMMTestLanguageFooConsumer fooConsumer; private MultiGenMMTestLanguageNameRefConsumer nameRefConsumer; - public MultiGenMMTestLanguageParserConfiguration(ICharSequenceWithOffset input, IMarkerFactory markerFactory, - IParsedTokenAcceptor tokenAcceptor, IHiddenTokenHandler hiddenTokenHandler, IConsumerUtility consumerUtil) { - super(input, markerFactory, tokenAcceptor, hiddenTokenHandler, consumerUtil); - this.xtextBuiltinConfiguration = new XtextBuiltinParserConfiguration( - input, markerFactory, tokenAcceptor, hiddenTokenHandler, consumerUtil); + public MultiGenMMTestLanguageParserConfiguration(IInternalParserConfiguration configuration) { + super(configuration); + this.xtextBuiltinConfiguration = new XtextBuiltinParserConfiguration(configuration); } public MultiGenMMTestLanguageFooConsumer getRootConsumer() { @@ -45,10 +38,10 @@ public class MultiGenMMTestLanguageParserConfiguration extends AbstractParserCon public void createNonTerminalConsumers() { getXtextBuiltinConfiguration().createNonTerminalConsumers(); fooConsumer = new MultiGenMMTestLanguageFooConsumer( - getInput(), getMarkerFactory(), getTokenAcceptor(), getHiddenTokenHandler(), getConsumerUtil(), null + this, null ); nameRefConsumer = new MultiGenMMTestLanguageNameRefConsumer( - getInput(), getMarkerFactory(), getTokenAcceptor(), getHiddenTokenHandler(), getConsumerUtil(), null + this, null ); } diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/packrat/consumers/MetamodelRefTestLanguageFooConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/packrat/consumers/MetamodelRefTestLanguageFooConsumer.java index 7148be5..50aa6b8 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/packrat/consumers/MetamodelRefTestLanguageFooConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/packrat/consumers/MetamodelRefTestLanguageFooConsumer.java @@ -4,17 +4,13 @@ Generated with Xtext package org.eclipse.xtext.metamodelreferencing.tests.parser.packrat.consumers; import org.eclipse.emf.ecore.EObject; -import org.eclipse.xtext.parser.packrat.ICharSequenceWithOffset; -import org.eclipse.xtext.parser.packrat.IHiddenTokenHandler; -import org.eclipse.xtext.parser.packrat.IMarkerFactory; 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.consumers.INonTerminalConsumerConfiguration; import org.eclipse.xtext.parser.packrat.consumers.ConsumeResult; 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.metamodelreferencing.tests.services.MetamodelRefTestLanguageGrammarAccess; import org.eclipse.xtext.metamodelreferencing.tests.services.MetamodelRefTestLanguageGrammarAccess.FooElements; @@ -30,10 +26,8 @@ public final class MetamodelRefTestLanguageFooConsumer extends NonTerminalConsum private ISequenceMatcher ruleCall$3$Delimiter; - public MetamodelRefTestLanguageFooConsumer(ICharSequenceWithOffset input, IMarkerFactory markerFactory, - IParsedTokenAcceptor tokenAcceptor, IHiddenTokenHandler hiddenTokenHandler, IConsumerUtility consumerUtil, - ITerminalConsumer[] hiddenTokens) { - super(input, markerFactory, tokenAcceptor, hiddenTokenHandler, consumerUtil, hiddenTokens); + public MetamodelRefTestLanguageFooConsumer(INonTerminalConsumerConfiguration configuration, ITerminalConsumer[] hiddenTokens) { + super(configuration, hiddenTokens); ruleCall$3$Delimiter = ISequenceMatcher.Factory.nullMatcher(); } diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/packrat/consumers/MetamodelRefTestLanguageMyRuleConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/packrat/consumers/MetamodelRefTestLanguageMyRuleConsumer.java index 7de9741..905898f 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/packrat/consumers/MetamodelRefTestLanguageMyRuleConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/packrat/consumers/MetamodelRefTestLanguageMyRuleConsumer.java @@ -4,17 +4,13 @@ Generated with Xtext package org.eclipse.xtext.metamodelreferencing.tests.parser.packrat.consumers; import org.eclipse.emf.ecore.EObject; -import org.eclipse.xtext.parser.packrat.ICharSequenceWithOffset; -import org.eclipse.xtext.parser.packrat.IHiddenTokenHandler; -import org.eclipse.xtext.parser.packrat.IMarkerFactory; 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.consumers.INonTerminalConsumerConfiguration; import org.eclipse.xtext.parser.packrat.consumers.ConsumeResult; 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.metamodelreferencing.tests.services.MetamodelRefTestLanguageGrammarAccess; import org.eclipse.xtext.metamodelreferencing.tests.services.MetamodelRefTestLanguageGrammarAccess.MyRuleElements; @@ -28,10 +24,8 @@ public final class MetamodelRefTestLanguageMyRuleConsumer extends NonTerminalCon private ISequenceMatcher ruleCall$2$Delimiter; - public MetamodelRefTestLanguageMyRuleConsumer(ICharSequenceWithOffset input, IMarkerFactory markerFactory, - IParsedTokenAcceptor tokenAcceptor, IHiddenTokenHandler hiddenTokenHandler, IConsumerUtility consumerUtil, - ITerminalConsumer[] hiddenTokens) { - super(input, markerFactory, tokenAcceptor, hiddenTokenHandler, consumerUtil, hiddenTokens); + public MetamodelRefTestLanguageMyRuleConsumer(INonTerminalConsumerConfiguration configuration, ITerminalConsumer[] hiddenTokens) { + super(configuration, hiddenTokens); ruleCall$2$Delimiter = ISequenceMatcher.Factory.nullMatcher(); } diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/packrat/consumers/MetamodelRefTestLanguageNameRefConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/packrat/consumers/MetamodelRefTestLanguageNameRefConsumer.java index 411ea7b..acfc3d1 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/packrat/consumers/MetamodelRefTestLanguageNameRefConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/packrat/consumers/MetamodelRefTestLanguageNameRefConsumer.java @@ -4,17 +4,13 @@ Generated with Xtext package org.eclipse.xtext.metamodelreferencing.tests.parser.packrat.consumers; import org.eclipse.emf.ecore.EObject; -import org.eclipse.xtext.parser.packrat.ICharSequenceWithOffset; -import org.eclipse.xtext.parser.packrat.IHiddenTokenHandler; -import org.eclipse.xtext.parser.packrat.IMarkerFactory; 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.consumers.INonTerminalConsumerConfiguration; import org.eclipse.xtext.parser.packrat.consumers.ConsumeResult; 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.metamodelreferencing.tests.services.MetamodelRefTestLanguageGrammarAccess; import org.eclipse.xtext.metamodelreferencing.tests.services.MetamodelRefTestLanguageGrammarAccess.NameRefElements; @@ -28,10 +24,8 @@ public final class MetamodelRefTestLanguageNameRefConsumer extends NonTerminalCo private ISequenceMatcher crossReference$2$Delimiter; - public MetamodelRefTestLanguageNameRefConsumer(ICharSequenceWithOffset input, IMarkerFactory markerFactory, - IParsedTokenAcceptor tokenAcceptor, IHiddenTokenHandler hiddenTokenHandler, IConsumerUtility consumerUtil, - ITerminalConsumer[] hiddenTokens) { - super(input, markerFactory, tokenAcceptor, hiddenTokenHandler, consumerUtil, hiddenTokens); + public MetamodelRefTestLanguageNameRefConsumer(INonTerminalConsumerConfiguration configuration, ITerminalConsumer[] hiddenTokens) { + super(configuration, hiddenTokens); crossReference$2$Delimiter = ISequenceMatcher.Factory.nullMatcher(); } diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/packrat/consumers/MultiGenMMTestLanguageFooConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/packrat/consumers/MultiGenMMTestLanguageFooConsumer.java index e3ff721..e48e42f 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/packrat/consumers/MultiGenMMTestLanguageFooConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/packrat/consumers/MultiGenMMTestLanguageFooConsumer.java @@ -4,17 +4,13 @@ Generated with Xtext package org.eclipse.xtext.metamodelreferencing.tests.parser.packrat.consumers; import org.eclipse.emf.ecore.EObject; -import org.eclipse.xtext.parser.packrat.ICharSequenceWithOffset; -import org.eclipse.xtext.parser.packrat.IHiddenTokenHandler; -import org.eclipse.xtext.parser.packrat.IMarkerFactory; 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.consumers.INonTerminalConsumerConfiguration; import org.eclipse.xtext.parser.packrat.consumers.ConsumeResult; 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.metamodelreferencing.tests.services.MultiGenMMTestLanguageGrammarAccess; import org.eclipse.xtext.metamodelreferencing.tests.services.MultiGenMMTestLanguageGrammarAccess.FooElements; @@ -30,10 +26,8 @@ public final class MultiGenMMTestLanguageFooConsumer extends NonTerminalConsumer private ISequenceMatcher ruleCall$3$Delimiter; - public MultiGenMMTestLanguageFooConsumer(ICharSequenceWithOffset input, IMarkerFactory markerFactory, - IParsedTokenAcceptor tokenAcceptor, IHiddenTokenHandler hiddenTokenHandler, IConsumerUtility consumerUtil, - ITerminalConsumer[] hiddenTokens) { - super(input, markerFactory, tokenAcceptor, hiddenTokenHandler, consumerUtil, hiddenTokens); + public MultiGenMMTestLanguageFooConsumer(INonTerminalConsumerConfiguration configuration, ITerminalConsumer[] hiddenTokens) { + super(configuration, hiddenTokens); ruleCall$3$Delimiter = ISequenceMatcher.Factory.nullMatcher(); } diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/packrat/consumers/MultiGenMMTestLanguageNameRefConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/packrat/consumers/MultiGenMMTestLanguageNameRefConsumer.java index 0cbfa29..e87f33e 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/packrat/consumers/MultiGenMMTestLanguageNameRefConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/packrat/consumers/MultiGenMMTestLanguageNameRefConsumer.java @@ -4,17 +4,13 @@ Generated with Xtext package org.eclipse.xtext.metamodelreferencing.tests.parser.packrat.consumers; import org.eclipse.emf.ecore.EObject; -import org.eclipse.xtext.parser.packrat.ICharSequenceWithOffset; -import org.eclipse.xtext.parser.packrat.IHiddenTokenHandler; -import org.eclipse.xtext.parser.packrat.IMarkerFactory; 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.consumers.INonTerminalConsumerConfiguration; import org.eclipse.xtext.parser.packrat.consumers.ConsumeResult; 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.metamodelreferencing.tests.services.MultiGenMMTestLanguageGrammarAccess; import org.eclipse.xtext.metamodelreferencing.tests.services.MultiGenMMTestLanguageGrammarAccess.NameRefElements; @@ -28,10 +24,8 @@ public final class MultiGenMMTestLanguageNameRefConsumer extends NonTerminalCons private ISequenceMatcher ruleCall$2$Delimiter; - public MultiGenMMTestLanguageNameRefConsumer(ICharSequenceWithOffset input, IMarkerFactory markerFactory, - IParsedTokenAcceptor tokenAcceptor, IHiddenTokenHandler hiddenTokenHandler, IConsumerUtility consumerUtil, - ITerminalConsumer[] hiddenTokens) { - super(input, markerFactory, tokenAcceptor, hiddenTokenHandler, consumerUtil, hiddenTokens); + public MultiGenMMTestLanguageNameRefConsumer(INonTerminalConsumerConfiguration configuration, ITerminalConsumer[] hiddenTokens) { + super(configuration, hiddenTokens); ruleCall$2$Delimiter = ISequenceMatcher.Factory.nullMatcher(); } diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/parser/packrat/DatatypeRulesTestLanguagePackratParser.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/parser/packrat/DatatypeRulesTestLanguagePackratParser.java index 906343b..14a07a9 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/parser/packrat/DatatypeRulesTestLanguagePackratParser.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/parser/packrat/DatatypeRulesTestLanguagePackratParser.java @@ -4,19 +4,13 @@ Generated with Xtext package org.eclipse.xtext.parser.datatyperules.parser.packrat; import org.eclipse.xtext.parser.packrat.AbstractPackratParser; -import org.eclipse.xtext.parser.packrat.ICharSequenceWithOffset; -import org.eclipse.xtext.parser.packrat.IHiddenTokenHandler; -import org.eclipse.xtext.parser.packrat.IMarkerFactory; -import org.eclipse.xtext.parser.packrat.consumers.IConsumerUtility; -import org.eclipse.xtext.parser.packrat.tokens.IParsedTokenAcceptor; +import org.eclipse.xtext.parser.packrat.AbstractParserConfiguration.IInternalParserConfiguration; public class DatatypeRulesTestLanguagePackratParser extends AbstractPackratParser { @Override - protected DatatypeRulesTestLanguageParserConfiguration createParserConfiguration(ICharSequenceWithOffset input, - IMarkerFactory markerFactory, IParsedTokenAcceptor tokenAcceptor, IHiddenTokenHandler hiddenTokenHandler, - IConsumerUtility consumerUtil) { - return new DatatypeRulesTestLanguageParserConfiguration(input, markerFactory, tokenAcceptor, hiddenTokenHandler, consumerUtil); + protected DatatypeRulesTestLanguageParserConfiguration createParserConfiguration(IInternalParserConfiguration configuration) { + return new DatatypeRulesTestLanguageParserConfiguration(configuration); } } diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/parser/packrat/DatatypeRulesTestLanguageParserConfiguration.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/parser/packrat/DatatypeRulesTestLanguageParserConfiguration.java index 7565919..ea6e9b9 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/parser/packrat/DatatypeRulesTestLanguageParserConfiguration.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/parser/packrat/DatatypeRulesTestLanguageParserConfiguration.java @@ -4,13 +4,7 @@ Generated with Xtext package org.eclipse.xtext.parser.datatyperules.parser.packrat; import org.eclipse.xtext.parser.packrat.AbstractParserConfiguration; -import org.eclipse.xtext.parser.packrat.ICharSequenceWithOffset; -import org.eclipse.xtext.parser.packrat.IHiddenTokenHandler; -import org.eclipse.xtext.parser.packrat.IMarkerFactory; -import org.eclipse.xtext.parser.packrat.consumers.IConsumerUtility; -import org.eclipse.xtext.parser.packrat.consumers.INonTerminalConsumer; import org.eclipse.xtext.parser.packrat.consumers.ITerminalConsumer; -import org.eclipse.xtext.parser.packrat.tokens.IParsedTokenAcceptor; import org.eclipse.xtext.builtin.parser.packrat.XtextBuiltinParserConfiguration; @@ -29,6 +23,7 @@ import org.eclipse.xtext.builtin.parser.packrat.consumers.XtextBuiltinSL_COMMENT import org.eclipse.xtext.builtin.parser.packrat.consumers.XtextBuiltinWSConsumer; import org.eclipse.xtext.builtin.parser.packrat.consumers.XtextBuiltinANY_OTHERConsumer; +@SuppressWarnings("unused") public class DatatypeRulesTestLanguageParserConfiguration extends AbstractParserConfiguration { private XtextBuiltinParserConfiguration xtextBuiltinConfiguration; @@ -41,11 +36,9 @@ public class DatatypeRulesTestLanguageParserConfiguration extends AbstractParser private DatatypeRulesTestLanguageVectorConsumer vectorConsumer; private DatatypeRulesTestLanguageDotsConsumer dotsConsumer; - public DatatypeRulesTestLanguageParserConfiguration(ICharSequenceWithOffset input, IMarkerFactory markerFactory, - IParsedTokenAcceptor tokenAcceptor, IHiddenTokenHandler hiddenTokenHandler, IConsumerUtility consumerUtil) { - super(input, markerFactory, tokenAcceptor, hiddenTokenHandler, consumerUtil); - this.xtextBuiltinConfiguration = new XtextBuiltinParserConfiguration( - input, markerFactory, tokenAcceptor, hiddenTokenHandler, consumerUtil); + public DatatypeRulesTestLanguageParserConfiguration(IInternalParserConfiguration configuration) { + super(configuration); + this.xtextBuiltinConfiguration = new XtextBuiltinParserConfiguration(configuration); } public DatatypeRulesTestLanguageCompositeModelConsumer getRootConsumer() { @@ -55,26 +48,25 @@ public class DatatypeRulesTestLanguageParserConfiguration extends AbstractParser public void createNonTerminalConsumers() { getXtextBuiltinConfiguration().createNonTerminalConsumers(); compositeModelConsumer = new DatatypeRulesTestLanguageCompositeModelConsumer( - getInput(), getMarkerFactory(), getTokenAcceptor(), getHiddenTokenHandler(), getConsumerUtil(), - new ITerminalConsumer[]{ getWsConsumer(), getMlCommentConsumer(), getSlCommentConsumer() } + this, new ITerminalConsumer[]{ getWsConsumer(), getMlCommentConsumer(), getSlCommentConsumer() } ); modelConsumer = new DatatypeRulesTestLanguageModelConsumer( - getInput(), getMarkerFactory(), getTokenAcceptor(), getHiddenTokenHandler(), getConsumerUtil(), null + this, null ); modelIdConsumer = new DatatypeRulesTestLanguageModelIdConsumer( - getInput(), getMarkerFactory(), getTokenAcceptor(), getHiddenTokenHandler(), getConsumerUtil(), null + this, null ); nestedModelIdConsumer = new DatatypeRulesTestLanguageNestedModelIdConsumer( - getInput(), getMarkerFactory(), getTokenAcceptor(), getHiddenTokenHandler(), getConsumerUtil(), null + this, null ); fractionConsumer = new DatatypeRulesTestLanguageFractionConsumer( - getInput(), getMarkerFactory(), getTokenAcceptor(), getHiddenTokenHandler(), getConsumerUtil(), null + this, null ); vectorConsumer = new DatatypeRulesTestLanguageVectorConsumer( - getInput(), getMarkerFactory(), getTokenAcceptor(), getHiddenTokenHandler(), getConsumerUtil(), null + this, null ); dotsConsumer = new DatatypeRulesTestLanguageDotsConsumer( - getInput(), getMarkerFactory(), getTokenAcceptor(), getHiddenTokenHandler(), getConsumerUtil(), null + this, null ); } diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/parser/packrat/consumers/DatatypeRulesTestLanguageCompositeModelConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/parser/packrat/consumers/DatatypeRulesTestLanguageCompositeModelConsumer.java index 084cb14..8a3b2a3 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/parser/packrat/consumers/DatatypeRulesTestLanguageCompositeModelConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/parser/packrat/consumers/DatatypeRulesTestLanguageCompositeModelConsumer.java @@ -4,17 +4,13 @@ Generated with Xtext package org.eclipse.xtext.parser.datatyperules.parser.packrat.consumers; import org.eclipse.emf.ecore.EObject; -import org.eclipse.xtext.parser.packrat.ICharSequenceWithOffset; -import org.eclipse.xtext.parser.packrat.IHiddenTokenHandler; -import org.eclipse.xtext.parser.packrat.IMarkerFactory; 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.consumers.INonTerminalConsumerConfiguration; import org.eclipse.xtext.parser.packrat.consumers.ConsumeResult; 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.parser.datatyperules.services.DatatypeRulesTestLanguageGrammarAccess; import org.eclipse.xtext.parser.datatyperules.services.DatatypeRulesTestLanguageGrammarAccess.CompositeModelElements; @@ -26,10 +22,8 @@ public final class DatatypeRulesTestLanguageCompositeModelConsumer extends NonTe private DatatypeRulesTestLanguageModelConsumer modelConsumer; - public DatatypeRulesTestLanguageCompositeModelConsumer(ICharSequenceWithOffset input, IMarkerFactory markerFactory, - IParsedTokenAcceptor tokenAcceptor, IHiddenTokenHandler hiddenTokenHandler, IConsumerUtility consumerUtil, - ITerminalConsumer[] hiddenTokens) { - super(input, markerFactory, tokenAcceptor, hiddenTokenHandler, consumerUtil, hiddenTokens); + public DatatypeRulesTestLanguageCompositeModelConsumer(INonTerminalConsumerConfiguration configuration, ITerminalConsumer[] hiddenTokens) { + super(configuration, hiddenTokens); } protected int doConsume() throws Exception { diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/parser/packrat/consumers/DatatypeRulesTestLanguageDotsConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/parser/packrat/consumers/DatatypeRulesTestLanguageDotsConsumer.java index fc9ce31..6ab4ed8 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/parser/packrat/consumers/DatatypeRulesTestLanguageDotsConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/parser/packrat/consumers/DatatypeRulesTestLanguageDotsConsumer.java @@ -4,17 +4,13 @@ Generated with Xtext package org.eclipse.xtext.parser.datatyperules.parser.packrat.consumers; import org.eclipse.emf.ecore.EObject; -import org.eclipse.xtext.parser.packrat.ICharSequenceWithOffset; -import org.eclipse.xtext.parser.packrat.IHiddenTokenHandler; -import org.eclipse.xtext.parser.packrat.IMarkerFactory; 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.consumers.INonTerminalConsumerConfiguration; import org.eclipse.xtext.parser.packrat.consumers.ConsumeResult; 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.parser.datatyperules.services.DatatypeRulesTestLanguageGrammarAccess; import org.eclipse.xtext.parser.datatyperules.services.DatatypeRulesTestLanguageGrammarAccess.DotsElements; @@ -30,10 +26,8 @@ public final class DatatypeRulesTestLanguageDotsConsumer extends NonTerminalCons private ICharacterClass keyword$5$Delimiter; - public DatatypeRulesTestLanguageDotsConsumer(ICharSequenceWithOffset input, IMarkerFactory markerFactory, - IParsedTokenAcceptor tokenAcceptor, IHiddenTokenHandler hiddenTokenHandler, IConsumerUtility consumerUtil, - ITerminalConsumer[] hiddenTokens) { - super(input, markerFactory, tokenAcceptor, hiddenTokenHandler, consumerUtil, hiddenTokens); + public DatatypeRulesTestLanguageDotsConsumer(INonTerminalConsumerConfiguration configuration, ITerminalConsumer[] hiddenTokens) { + super(configuration, hiddenTokens); keyword$3$Delimiter = ICharacterClass.Factory.nullClass(); keyword$4$Delimiter = ICharacterClass.Factory.nullClass(); keyword$5$Delimiter = ICharacterClass.Factory.nullClass(); diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/parser/packrat/consumers/DatatypeRulesTestLanguageFractionConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/parser/packrat/consumers/DatatypeRulesTestLanguageFractionConsumer.java index 2eae950..95a38ad 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/parser/packrat/consumers/DatatypeRulesTestLanguageFractionConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/parser/packrat/consumers/DatatypeRulesTestLanguageFractionConsumer.java @@ -4,17 +4,13 @@ Generated with Xtext package org.eclipse.xtext.parser.datatyperules.parser.packrat.consumers; import org.eclipse.emf.ecore.EObject; -import org.eclipse.xtext.parser.packrat.ICharSequenceWithOffset; -import org.eclipse.xtext.parser.packrat.IHiddenTokenHandler; -import org.eclipse.xtext.parser.packrat.IMarkerFactory; 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.consumers.INonTerminalConsumerConfiguration; import org.eclipse.xtext.parser.packrat.consumers.ConsumeResult; 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.parser.datatyperules.services.DatatypeRulesTestLanguageGrammarAccess; import org.eclipse.xtext.parser.datatyperules.services.DatatypeRulesTestLanguageGrammarAccess.FractionElements; @@ -32,10 +28,8 @@ public final class DatatypeRulesTestLanguageFractionConsumer extends NonTerminal private ISequenceMatcher ruleCall$5$Delimiter; - public DatatypeRulesTestLanguageFractionConsumer(ICharSequenceWithOffset input, IMarkerFactory markerFactory, - IParsedTokenAcceptor tokenAcceptor, IHiddenTokenHandler hiddenTokenHandler, IConsumerUtility consumerUtil, - ITerminalConsumer[] hiddenTokens) { - super(input, markerFactory, tokenAcceptor, hiddenTokenHandler, consumerUtil, hiddenTokens); + public DatatypeRulesTestLanguageFractionConsumer(INonTerminalConsumerConfiguration configuration, ITerminalConsumer[] hiddenTokens) { + super(configuration, hiddenTokens); keyword$4$Delimiter = ICharacterClass.Factory.nullClass(); ruleCall$2$Delimiter = ISequenceMatcher.Factory.nullMatcher(); ruleCall$5$Delimiter = ISequenceMatcher.Factory.nullMatcher(); diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/parser/packrat/consumers/DatatypeRulesTestLanguageModelConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/parser/packrat/consumers/DatatypeRulesTestLanguageModelConsumer.java index a5c0352..28600a4 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/parser/packrat/consumers/DatatypeRulesTestLanguageModelConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/parser/packrat/consumers/DatatypeRulesTestLanguageModelConsumer.java @@ -4,17 +4,13 @@ Generated with Xtext package org.eclipse.xtext.parser.datatyperules.parser.packrat.consumers; import org.eclipse.emf.ecore.EObject; -import org.eclipse.xtext.parser.packrat.ICharSequenceWithOffset; -import org.eclipse.xtext.parser.packrat.IHiddenTokenHandler; -import org.eclipse.xtext.parser.packrat.IMarkerFactory; 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.consumers.INonTerminalConsumerConfiguration; import org.eclipse.xtext.parser.packrat.consumers.ConsumeResult; 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.parser.datatyperules.services.DatatypeRulesTestLanguageGrammarAccess; import org.eclipse.xtext.parser.datatyperules.services.DatatypeRulesTestLanguageGrammarAccess.ModelElements; @@ -40,10 +36,8 @@ public final class DatatypeRulesTestLanguageModelConsumer extends NonTerminalCon private ICharacterClass keyword$19$Delimiter; - public DatatypeRulesTestLanguageModelConsumer(ICharSequenceWithOffset input, IMarkerFactory markerFactory, - IParsedTokenAcceptor tokenAcceptor, IHiddenTokenHandler hiddenTokenHandler, IConsumerUtility consumerUtil, - ITerminalConsumer[] hiddenTokens) { - super(input, markerFactory, tokenAcceptor, hiddenTokenHandler, consumerUtil, hiddenTokens); + public DatatypeRulesTestLanguageModelConsumer(INonTerminalConsumerConfiguration configuration, ITerminalConsumer[] hiddenTokens) { + super(configuration, hiddenTokens); keyword$8$Delimiter = ICharacterClass.Factory.nullClass(); keyword$12$Delimiter = ICharacterClass.Factory.nullClass(); keyword$16$Delimiter = ICharacterClass.Factory.nullClass(); diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/parser/packrat/consumers/DatatypeRulesTestLanguageModelIdConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/parser/packrat/consumers/DatatypeRulesTestLanguageModelIdConsumer.java index 7f5d8e3..79a0477 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/parser/packrat/consumers/DatatypeRulesTestLanguageModelIdConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/parser/packrat/consumers/DatatypeRulesTestLanguageModelIdConsumer.java @@ -4,17 +4,13 @@ Generated with Xtext package org.eclipse.xtext.parser.datatyperules.parser.packrat.consumers; import org.eclipse.emf.ecore.EObject; -import org.eclipse.xtext.parser.packrat.ICharSequenceWithOffset; -import org.eclipse.xtext.parser.packrat.IHiddenTokenHandler; -import org.eclipse.xtext.parser.packrat.IMarkerFactory; 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.consumers.INonTerminalConsumerConfiguration; import org.eclipse.xtext.parser.packrat.consumers.ConsumeResult; 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.parser.datatyperules.services.DatatypeRulesTestLanguageGrammarAccess; import org.eclipse.xtext.parser.datatyperules.services.DatatypeRulesTestLanguageGrammarAccess.ModelIdElements; @@ -32,10 +28,8 @@ public final class DatatypeRulesTestLanguageModelIdConsumer extends NonTerminalC private ISequenceMatcher ruleCall$5$Delimiter; - public DatatypeRulesTestLanguageModelIdConsumer(ICharSequenceWithOffset input, IMarkerFactory markerFactory, - IParsedTokenAcceptor tokenAcceptor, IHiddenTokenHandler hiddenTokenHandler, IConsumerUtility consumerUtil, - ITerminalConsumer[] hiddenTokens) { - super(input, markerFactory, tokenAcceptor, hiddenTokenHandler, consumerUtil, hiddenTokens); + public DatatypeRulesTestLanguageModelIdConsumer(INonTerminalConsumerConfiguration configuration, ITerminalConsumer[] hiddenTokens) { + super(configuration, hiddenTokens); keyword$4$Delimiter = ICharacterClass.Factory.nullClass(); ruleCall$3$Delimiter = ISequenceMatcher.Factory.nullMatcher(); ruleCall$5$Delimiter = ISequenceMatcher.Factory.nullMatcher(); diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/parser/packrat/consumers/DatatypeRulesTestLanguageNestedModelIdConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/parser/packrat/consumers/DatatypeRulesTestLanguageNestedModelIdConsumer.java index 59aa2bc..c2ec97b 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/parser/packrat/consumers/DatatypeRulesTestLanguageNestedModelIdConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/parser/packrat/consumers/DatatypeRulesTestLanguageNestedModelIdConsumer.java @@ -4,17 +4,13 @@ Generated with Xtext package org.eclipse.xtext.parser.datatyperules.parser.packrat.consumers; import org.eclipse.emf.ecore.EObject; -import org.eclipse.xtext.parser.packrat.ICharSequenceWithOffset; -import org.eclipse.xtext.parser.packrat.IHiddenTokenHandler; -import org.eclipse.xtext.parser.packrat.IMarkerFactory; 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.consumers.INonTerminalConsumerConfiguration; import org.eclipse.xtext.parser.packrat.consumers.ConsumeResult; 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.parser.datatyperules.services.DatatypeRulesTestLanguageGrammarAccess; import org.eclipse.xtext.parser.datatyperules.services.DatatypeRulesTestLanguageGrammarAccess.NestedModelIdElements; @@ -28,10 +24,8 @@ public final class DatatypeRulesTestLanguageNestedModelIdConsumer extends NonTer private ICharacterClass keyword$4$Delimiter; - public DatatypeRulesTestLanguageNestedModelIdConsumer(ICharSequenceWithOffset input, IMarkerFactory markerFactory, - IParsedTokenAcceptor tokenAcceptor, IHiddenTokenHandler hiddenTokenHandler, IConsumerUtility consumerUtil, - ITerminalConsumer[] hiddenTokens) { - super(input, markerFactory, tokenAcceptor, hiddenTokenHandler, consumerUtil, hiddenTokens); + public DatatypeRulesTestLanguageNestedModelIdConsumer(INonTerminalConsumerConfiguration configuration, ITerminalConsumer[] hiddenTokens) { + super(configuration, hiddenTokens); keyword$4$Delimiter = ICharacterClass.Factory.nullClass(); } diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/parser/packrat/consumers/DatatypeRulesTestLanguageVectorConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/parser/packrat/consumers/DatatypeRulesTestLanguageVectorConsumer.java index 5f29c7f..8377f23 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/parser/packrat/consumers/DatatypeRulesTestLanguageVectorConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/parser/packrat/consumers/DatatypeRulesTestLanguageVectorConsumer.java @@ -4,17 +4,13 @@ Generated with Xtext package org.eclipse.xtext.parser.datatyperules.parser.packrat.consumers; import org.eclipse.emf.ecore.EObject; -import org.eclipse.xtext.parser.packrat.ICharSequenceWithOffset; -import org.eclipse.xtext.parser.packrat.IHiddenTokenHandler; -import org.eclipse.xtext.parser.packrat.IMarkerFactory; 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.consumers.INonTerminalConsumerConfiguration; import org.eclipse.xtext.parser.packrat.consumers.ConsumeResult; 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.parser.datatyperules.services.DatatypeRulesTestLanguageGrammarAccess; import org.eclipse.xtext.parser.datatyperules.services.DatatypeRulesTestLanguageGrammarAccess.VectorElements; @@ -34,10 +30,8 @@ public final class DatatypeRulesTestLanguageVectorConsumer extends NonTerminalCo private ISequenceMatcher ruleCall$6$Delimiter; - public DatatypeRulesTestLanguageVectorConsumer(ICharSequenceWithOffset input, IMarkerFactory markerFactory, - IParsedTokenAcceptor tokenAcceptor, IHiddenTokenHandler hiddenTokenHandler, IConsumerUtility consumerUtil, - ITerminalConsumer[] hiddenTokens) { - super(input, markerFactory, tokenAcceptor, hiddenTokenHandler, consumerUtil, hiddenTokens); + public DatatypeRulesTestLanguageVectorConsumer(INonTerminalConsumerConfiguration configuration, ITerminalConsumer[] hiddenTokens) { + super(configuration, hiddenTokens); keyword$4$Delimiter = ICharacterClass.Factory.nullClass(); keyword$7$Delimiter = ICharacterClass.Factory.nullClass(); ruleCall$5$Delimiter = ISequenceMatcher.Factory.nullMatcher(); diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/EpatchTestLanguage.ecore b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/EpatchTestLanguage.ecore index 245e1eb..e5bdf15 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/EpatchTestLanguage.ecore +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/EpatchTestLanguage.ecore @@ -48,11 +48,11 @@ <eStructuralFeatures xsi:type="ecore:EReference" name="rightRoot" eType="//CreatedObject" containment="true"/> </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="NamedObject"> + <eStructuralFeatures xsi:type="ecore:EReference" name="leftMig" eType="//Migration" containment="true"/> + <eStructuralFeatures xsi:type="ecore:EReference" name="assignments" unique="false" upperBound="-1" eType="//Assignment" containment="true"/> <eStructuralFeatures xsi:type="ecore:EAttribute" name="name"> <eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/> </eStructuralFeatures> - <eStructuralFeatures xsi:type="ecore:EReference" name="assignments" unique="false" upperBound="-1" eType="//Assignment" containment="true"/> - <eStructuralFeatures xsi:type="ecore:EReference" name="leftMig" eType="//Migration" containment="true"/> </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="ObjectRef" eSuperTypes="//NamedObject"> <eStructuralFeatures xsi:type="ecore:EReference" name="leftRes" eType="//NamedResource"/> diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/EpatchTestLanguagePackratParser.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/EpatchTestLanguagePackratParser.java index 1768ffc..58d028a 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/EpatchTestLanguagePackratParser.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/EpatchTestLanguagePackratParser.java @@ -4,19 +4,13 @@ Generated with Xtext package org.eclipse.xtext.parser.epatch.parser.packrat; import org.eclipse.xtext.parser.packrat.AbstractPackratParser; -import org.eclipse.xtext.parser.packrat.ICharSequenceWithOffset; -import org.eclipse.xtext.parser.packrat.IHiddenTokenHandler; -import org.eclipse.xtext.parser.packrat.IMarkerFactory; -import org.eclipse.xtext.parser.packrat.consumers.IConsumerUtility; -import org.eclipse.xtext.parser.packrat.tokens.IParsedTokenAcceptor; +import org.eclipse.xtext.parser.packrat.AbstractParserConfiguration.IInternalParserConfiguration; public class EpatchTestLanguagePackratParser extends AbstractPackratParser { @Override - protected EpatchTestLanguageParserConfiguration createParserConfiguration(ICharSequenceWithOffset input, - IMarkerFactory markerFactory, IParsedTokenAcceptor tokenAcceptor, IHiddenTokenHandler hiddenTokenHandler, - IConsumerUtility consumerUtil) { - return new EpatchTestLanguageParserConfiguration(input, markerFactory, tokenAcceptor, hiddenTokenHandler, consumerUtil); + protected EpatchTestLanguageParserConfiguration createParserConfiguration(IInternalParserConfiguration configuration) { + return new EpatchTestLanguageParserConfiguration(configuration); } } diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/EpatchTestLanguageParserConfiguration.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/EpatchTestLanguageParserConfiguration.java index e69b679..f2e7243 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/EpatchTestLanguageParserConfiguration.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/EpatchTestLanguageParserConfiguration.java @@ -4,13 +4,7 @@ Generated with Xtext package org.eclipse.xtext.parser.epatch.parser.packrat; import org.eclipse.xtext.parser.packrat.AbstractParserConfiguration; -import org.eclipse.xtext.parser.packrat.ICharSequenceWithOffset; -import org.eclipse.xtext.parser.packrat.IHiddenTokenHandler; -import org.eclipse.xtext.parser.packrat.IMarkerFactory; -import org.eclipse.xtext.parser.packrat.consumers.IConsumerUtility; -import org.eclipse.xtext.parser.packrat.consumers.INonTerminalConsumer; import org.eclipse.xtext.parser.packrat.consumers.ITerminalConsumer; -import org.eclipse.xtext.parser.packrat.tokens.IParsedTokenAcceptor; import org.eclipse.xtext.builtin.parser.packrat.XtextBuiltinParserConfiguration; @@ -48,6 +42,7 @@ import org.eclipse.xtext.builtin.parser.packrat.consumers.XtextBuiltinSL_COMMENT import org.eclipse.xtext.builtin.parser.packrat.consumers.XtextBuiltinWSConsumer; import org.eclipse.xtext.builtin.parser.packrat.consumers.XtextBuiltinANY_OTHERConsumer; +@SuppressWarnings("unused") public class EpatchTestLanguageParserConfiguration extends AbstractParserConfiguration { private XtextBuiltinParserConfiguration xtextBuiltinConfiguration; @@ -79,11 +74,9 @@ public class EpatchTestLanguageParserConfiguration extends AbstractParserConfigu private EpatchTestLanguageJavaExecutableConsumer javaExecutableConsumer; private EpatchTestLanguageExpressionExecutableConsumer expressionExecutableConsumer; - public EpatchTestLanguageParserConfiguration(ICharSequenceWithOffset input, IMarkerFactory markerFactory, - IParsedTokenAcceptor tokenAcceptor, IHiddenTokenHandler hiddenTokenHandler, IConsumerUtility consumerUtil) { - super(input, markerFactory, tokenAcceptor, hiddenTokenHandler, consumerUtil); - this.xtextBuiltinConfiguration = new XtextBuiltinParserConfiguration( - input, markerFactory, tokenAcceptor, hiddenTokenHandler, consumerUtil); + public EpatchTestLanguageParserConfiguration(IInternalParserConfiguration configuration) { + super(configuration); + this.xtextBuiltinConfiguration = new XtextBuiltinParserConfiguration(configuration); } public EpatchTestLanguageEPatchConsumer getRootConsumer() { @@ -93,86 +86,85 @@ public class EpatchTestLanguageParserConfiguration extends AbstractParserConfigu public void createNonTerminalConsumers() { getXtextBuiltinConfiguration().createNonTerminalConsumers(); ePatchConsumer = new EpatchTestLanguageEPatchConsumer( - getInput(), getMarkerFactory(), getTokenAcceptor(), getHiddenTokenHandler(), getConsumerUtil(), - new ITerminalConsumer[]{ getWsConsumer(), getMlCommentConsumer(), getSlCommentConsumer() } + this, new ITerminalConsumer[]{ getWsConsumer(), getMlCommentConsumer(), getSlCommentConsumer() } ); importConsumer = new EpatchTestLanguageImportConsumer( - getInput(), getMarkerFactory(), getTokenAcceptor(), getHiddenTokenHandler(), getConsumerUtil(), null + this, null ); modelImportConsumer = new EpatchTestLanguageModelImportConsumer( - getInput(), getMarkerFactory(), getTokenAcceptor(), getHiddenTokenHandler(), getConsumerUtil(), null + this, null ); resourceImportConsumer = new EpatchTestLanguageResourceImportConsumer( - getInput(), getMarkerFactory(), getTokenAcceptor(), getHiddenTokenHandler(), getConsumerUtil(), null + this, null ); ePackageImportConsumer = new EpatchTestLanguageEPackageImportConsumer( - getInput(), getMarkerFactory(), getTokenAcceptor(), getHiddenTokenHandler(), getConsumerUtil(), null + this, null ); javaImportConsumer = new EpatchTestLanguageJavaImportConsumer( - getInput(), getMarkerFactory(), getTokenAcceptor(), getHiddenTokenHandler(), getConsumerUtil(), null + this, null ); extensionImportConsumer = new EpatchTestLanguageExtensionImportConsumer( - getInput(), getMarkerFactory(), getTokenAcceptor(), getHiddenTokenHandler(), getConsumerUtil(), null + this, null ); namedResourceConsumer = new EpatchTestLanguageNamedResourceConsumer( - getInput(), getMarkerFactory(), getTokenAcceptor(), getHiddenTokenHandler(), getConsumerUtil(), null + this, null ); namedObjectConsumer = new EpatchTestLanguageNamedObjectConsumer( - getInput(), getMarkerFactory(), getTokenAcceptor(), getHiddenTokenHandler(), getConsumerUtil(), null + this, null ); objectRefConsumer = new EpatchTestLanguageObjectRefConsumer( - getInput(), getMarkerFactory(), getTokenAcceptor(), getHiddenTokenHandler(), getConsumerUtil(), null + this, null ); assignmentConsumer = new EpatchTestLanguageAssignmentConsumer( - getInput(), getMarkerFactory(), getTokenAcceptor(), getHiddenTokenHandler(), getConsumerUtil(), null + this, null ); biSingleAssignmentConsumer = new EpatchTestLanguageBiSingleAssignmentConsumer( - getInput(), getMarkerFactory(), getTokenAcceptor(), getHiddenTokenHandler(), getConsumerUtil(), null + this, null ); biListAssignmentConsumer = new EpatchTestLanguageBiListAssignmentConsumer( - getInput(), getMarkerFactory(), getTokenAcceptor(), getHiddenTokenHandler(), getConsumerUtil(), null + this, null ); monoSingleAssignmentConsumer = new EpatchTestLanguageMonoSingleAssignmentConsumer( - getInput(), getMarkerFactory(), getTokenAcceptor(), getHiddenTokenHandler(), getConsumerUtil(), null + this, null ); monoListAssignmentConsumer = new EpatchTestLanguageMonoListAssignmentConsumer( - getInput(), getMarkerFactory(), getTokenAcceptor(), getHiddenTokenHandler(), getConsumerUtil(), null + this, null ); assignmentValueConsumer = new EpatchTestLanguageAssignmentValueConsumer( - getInput(), getMarkerFactory(), getTokenAcceptor(), getHiddenTokenHandler(), getConsumerUtil(), null + this, null ); listAssignmentValueConsumer = new EpatchTestLanguageListAssignmentValueConsumer( - getInput(), getMarkerFactory(), getTokenAcceptor(), getHiddenTokenHandler(), getConsumerUtil(), null + this, null ); singleAssignmentValueConsumer = new EpatchTestLanguageSingleAssignmentValueConsumer( - getInput(), getMarkerFactory(), getTokenAcceptor(), getHiddenTokenHandler(), getConsumerUtil(), null + this, null ); createdObjectConsumer = new EpatchTestLanguageCreatedObjectConsumer( - getInput(), getMarkerFactory(), getTokenAcceptor(), getHiddenTokenHandler(), getConsumerUtil(), null + this, null ); objectNewConsumer = new EpatchTestLanguageObjectNewConsumer( - getInput(), getMarkerFactory(), getTokenAcceptor(), getHiddenTokenHandler(), getConsumerUtil(), null + this, null ); objectCopyConsumer = new EpatchTestLanguageObjectCopyConsumer( - getInput(), getMarkerFactory(), getTokenAcceptor(), getHiddenTokenHandler(), getConsumerUtil(), null + this, null ); migrationConsumer = new EpatchTestLanguageMigrationConsumer( - getInput(), getMarkerFactory(), getTokenAcceptor(), getHiddenTokenHandler(), getConsumerUtil(), null + this, null ); executableConsumer = new EpatchTestLanguageExecutableConsumer( - getInput(), getMarkerFactory(), getTokenAcceptor(), getHiddenTokenHandler(), getConsumerUtil(), null + this, null ); javaExecutableConsumer = new EpatchTestLanguageJavaExecutableConsumer( - getInput(), getMarkerFactory(), getTokenAcceptor(), getHiddenTokenHandler(), getConsumerUtil(), null + this, null ); expressionExecutableConsumer = new EpatchTestLanguageExpressionExecutableConsumer( - getInput(), getMarkerFactory(), getTokenAcceptor(), getHiddenTokenHandler(), getConsumerUtil(), null + this, null ); } public void createTerminalConsumers() { getXtextBuiltinConfiguration().createTerminalConsumers(); - fragmentConsumer = new EpatchTestLanguageFRAGMENTConsumer(getInput(), getMarkerFactory(), getTokenAcceptor()); + fragmentConsumer = new EpatchTestLanguageFRAGMENTConsumer(this); } public void configureConsumers() { diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageAssignmentConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageAssignmentConsumer.java index b1467e4..f477e6e 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageAssignmentConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageAssignmentConsumer.java @@ -4,17 +4,13 @@ Generated with Xtext package org.eclipse.xtext.parser.epatch.parser.packrat.consumers; import org.eclipse.emf.ecore.EObject; -import org.eclipse.xtext.parser.packrat.ICharSequenceWithOffset; -import org.eclipse.xtext.parser.packrat.IHiddenTokenHandler; -import org.eclipse.xtext.parser.packrat.IMarkerFactory; 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.consumers.INonTerminalConsumerConfiguration; import org.eclipse.xtext.parser.packrat.consumers.ConsumeResult; 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.parser.epatch.services.EpatchTestLanguageGrammarAccess; import org.eclipse.xtext.parser.epatch.services.EpatchTestLanguageGrammarAccess.AssignmentElements; @@ -32,10 +28,8 @@ public final class EpatchTestLanguageAssignmentConsumer extends NonTerminalConsu private EpatchTestLanguageMonoListAssignmentConsumer monoListAssignmentConsumer; private EpatchTestLanguageMonoSingleAssignmentConsumer monoSingleAssignmentConsumer; - public EpatchTestLanguageAssignmentConsumer(ICharSequenceWithOffset input, IMarkerFactory markerFactory, - IParsedTokenAcceptor tokenAcceptor, IHiddenTokenHandler hiddenTokenHandler, IConsumerUtility consumerUtil, - ITerminalConsumer[] hiddenTokens) { - super(input, markerFactory, tokenAcceptor, hiddenTokenHandler, consumerUtil, hiddenTokens); + public EpatchTestLanguageAssignmentConsumer(INonTerminalConsumerConfiguration configuration, ITerminalConsumer[] hiddenTokens) { + super(configuration, hiddenTokens); } protected int doConsume() throws Exception { diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageAssignmentValueConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageAssignmentValueConsumer.java index 03602d3..bc3385a 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageAssignmentValueConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageAssignmentValueConsumer.java @@ -4,17 +4,13 @@ Generated with Xtext package org.eclipse.xtext.parser.epatch.parser.packrat.consumers; import org.eclipse.emf.ecore.EObject; -import org.eclipse.xtext.parser.packrat.ICharSequenceWithOffset; -import org.eclipse.xtext.parser.packrat.IHiddenTokenHandler; -import org.eclipse.xtext.parser.packrat.IMarkerFactory; 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.consumers.INonTerminalConsumerConfiguration; import org.eclipse.xtext.parser.packrat.consumers.ConsumeResult; 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.parser.epatch.services.EpatchTestLanguageGrammarAccess; import org.eclipse.xtext.parser.epatch.services.EpatchTestLanguageGrammarAccess.AssignmentValueElements; @@ -52,10 +48,8 @@ public final class EpatchTestLanguageAssignmentValueConsumer extends NonTerminal private ISequenceMatcher ruleCall$28$Delimiter; - public EpatchTestLanguageAssignmentValueConsumer(ICharSequenceWithOffset input, IMarkerFactory markerFactory, - IParsedTokenAcceptor tokenAcceptor, IHiddenTokenHandler hiddenTokenHandler, IConsumerUtility consumerUtil, - ITerminalConsumer[] hiddenTokens) { - super(input, markerFactory, tokenAcceptor, hiddenTokenHandler, consumerUtil, hiddenTokens); + public EpatchTestLanguageAssignmentValueConsumer(INonTerminalConsumerConfiguration configuration, ITerminalConsumer[] hiddenTokens) { + super(configuration, hiddenTokens); crossReference$8$Delimiter = ISequenceMatcher.Factory.nullMatcher(); crossReference$25$Delimiter = ISequenceMatcher.Factory.nullMatcher(); keyword$12$Delimiter = ICharacterClass.Factory.nullClass(); diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageBiListAssignmentConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageBiListAssignmentConsumer.java index e29e39b..0cb65d2 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageBiListAssignmentConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageBiListAssignmentConsumer.java @@ -4,17 +4,13 @@ Generated with Xtext package org.eclipse.xtext.parser.epatch.parser.packrat.consumers; import org.eclipse.emf.ecore.EObject; -import org.eclipse.xtext.parser.packrat.ICharSequenceWithOffset; -import org.eclipse.xtext.parser.packrat.IHiddenTokenHandler; -import org.eclipse.xtext.parser.packrat.IMarkerFactory; 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.consumers.INonTerminalConsumerConfiguration; import org.eclipse.xtext.parser.packrat.consumers.ConsumeResult; 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.parser.epatch.services.EpatchTestLanguageGrammarAccess; import org.eclipse.xtext.parser.epatch.services.EpatchTestLanguageGrammarAccess.BiListAssignmentElements; @@ -44,10 +40,8 @@ public final class EpatchTestLanguageBiListAssignmentConsumer extends NonTermina private ISequenceMatcher ruleCall$9$Delimiter; - public EpatchTestLanguageBiListAssignmentConsumer(ICharSequenceWithOffset input, IMarkerFactory markerFactory, - IParsedTokenAcceptor tokenAcceptor, IHiddenTokenHandler hiddenTokenHandler, IConsumerUtility consumerUtil, - ITerminalConsumer[] hiddenTokens) { - super(input, markerFactory, tokenAcceptor, hiddenTokenHandler, consumerUtil, hiddenTokens); + public EpatchTestLanguageBiListAssignmentConsumer(INonTerminalConsumerConfiguration configuration, ITerminalConsumer[] hiddenTokens) { + super(configuration, hiddenTokens); keyword$10$Delimiter = ICharacterClass.Factory.nullClass(); keyword$11$Delimiter = ICharacterClass.Factory.nullClass(); keyword$16$Delimiter = ICharacterClass.Factory.nullClass(); diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageBiSingleAssignmentConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageBiSingleAssignmentConsumer.java index 4422544..4e1e226 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageBiSingleAssignmentConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageBiSingleAssignmentConsumer.java @@ -4,17 +4,13 @@ Generated with Xtext package org.eclipse.xtext.parser.epatch.parser.packrat.consumers; import org.eclipse.emf.ecore.EObject; -import org.eclipse.xtext.parser.packrat.ICharSequenceWithOffset; -import org.eclipse.xtext.parser.packrat.IHiddenTokenHandler; -import org.eclipse.xtext.parser.packrat.IMarkerFactory; 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.consumers.INonTerminalConsumerConfiguration; import org.eclipse.xtext.parser.packrat.consumers.ConsumeResult; 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.parser.epatch.services.EpatchTestLanguageGrammarAccess; import org.eclipse.xtext.parser.epatch.services.EpatchTestLanguageGrammarAccess.BiSingleAssignmentElements; @@ -36,10 +32,8 @@ public final class EpatchTestLanguageBiSingleAssignmentConsumer extends NonTermi private ISequenceMatcher ruleCall$7$Delimiter; - public EpatchTestLanguageBiSingleAssignmentConsumer(ICharSequenceWithOffset input, IMarkerFactory markerFactory, - IParsedTokenAcceptor tokenAcceptor, IHiddenTokenHandler hiddenTokenHandler, IConsumerUtility consumerUtil, - ITerminalConsumer[] hiddenTokens) { - super(input, markerFactory, tokenAcceptor, hiddenTokenHandler, consumerUtil, hiddenTokens); + public EpatchTestLanguageBiSingleAssignmentConsumer(INonTerminalConsumerConfiguration configuration, ITerminalConsumer[] hiddenTokens) { + super(configuration, hiddenTokens); keyword$8$Delimiter = ICharacterClass.Factory.nullClass(); keyword$11$Delimiter = ICharacterClass.Factory.nullClass(); keyword$14$Delimiter = ICharacterClass.Factory.nullClass(); diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageCreatedObjectConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageCreatedObjectConsumer.java index 5567ea1..8528ab4 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageCreatedObjectConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageCreatedObjectConsumer.java @@ -4,17 +4,13 @@ Generated with Xtext package org.eclipse.xtext.parser.epatch.parser.packrat.consumers; import org.eclipse.emf.ecore.EObject; -import org.eclipse.xtext.parser.packrat.ICharSequenceWithOffset; -import org.eclipse.xtext.parser.packrat.IHiddenTokenHandler; -import org.eclipse.xtext.parser.packrat.IMarkerFactory; 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.consumers.INonTerminalConsumerConfiguration; import org.eclipse.xtext.parser.packrat.consumers.ConsumeResult; 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.parser.epatch.services.EpatchTestLanguageGrammarAccess; import org.eclipse.xtext.parser.epatch.services.EpatchTestLanguageGrammarAccess.CreatedObjectElements; @@ -42,10 +38,8 @@ public final class EpatchTestLanguageCreatedObjectConsumer extends NonTerminalCo private ISequenceMatcher ruleCall$7$Delimiter; - public EpatchTestLanguageCreatedObjectConsumer(ICharSequenceWithOffset input, IMarkerFactory markerFactory, - IParsedTokenAcceptor tokenAcceptor, IHiddenTokenHandler hiddenTokenHandler, IConsumerUtility consumerUtil, - ITerminalConsumer[] hiddenTokens) { - super(input, markerFactory, tokenAcceptor, hiddenTokenHandler, consumerUtil, hiddenTokens); + public EpatchTestLanguageCreatedObjectConsumer(INonTerminalConsumerConfiguration configuration, ITerminalConsumer[] hiddenTokens) { + super(configuration, hiddenTokens); keyword$11$Delimiter = ICharacterClass.Factory.nullClass(); keyword$19$Delimiter = ICharacterClass.Factory.nullClass(); ruleCall$7$Delimiter = ISequenceMatcher.Factory.nullMatcher(); diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageEPackageImportConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageEPackageImportConsumer.java index 597c89c..b1b769c 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageEPackageImportConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageEPackageImportConsumer.java @@ -4,17 +4,13 @@ Generated with Xtext package org.eclipse.xtext.parser.epatch.parser.packrat.consumers; import org.eclipse.emf.ecore.EObject; -import org.eclipse.xtext.parser.packrat.ICharSequenceWithOffset; -import org.eclipse.xtext.parser.packrat.IHiddenTokenHandler; -import org.eclipse.xtext.parser.packrat.IMarkerFactory; 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.consumers.INonTerminalConsumerConfiguration; import org.eclipse.xtext.parser.packrat.consumers.ConsumeResult; 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.parser.epatch.services.EpatchTestLanguageGrammarAccess; import org.eclipse.xtext.parser.epatch.services.EpatchTestLanguageGrammarAccess.EPackageImportElements; @@ -36,10 +32,8 @@ public final class EpatchTestLanguageEPackageImportConsumer extends NonTerminalC private ISequenceMatcher ruleCall$9$Delimiter; - public EpatchTestLanguageEPackageImportConsumer(ICharSequenceWithOffset input, IMarkerFactory markerFactory, - IParsedTokenAcceptor tokenAcceptor, IHiddenTokenHandler hiddenTokenHandler, IConsumerUtility consumerUtil, - ITerminalConsumer[] hiddenTokens) { - super(input, markerFactory, tokenAcceptor, hiddenTokenHandler, consumerUtil, hiddenTokens); + public EpatchTestLanguageEPackageImportConsumer(INonTerminalConsumerConfiguration configuration, ITerminalConsumer[] hiddenTokens) { + super(configuration, hiddenTokens); keyword$4$Delimiter = ICharacterClass.Factory.nullClass(); keyword$7$Delimiter = ICharacterClass.Factory.nullClass(); ruleCall$6$Delimiter = ISequenceMatcher.Factory.nullMatcher(); diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageEPatchConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageEPatchConsumer.java index 70e3086..12d2d2c 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageEPatchConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageEPatchConsumer.java @@ -4,17 +4,13 @@ Generated with Xtext package org.eclipse.xtext.parser.epatch.parser.packrat.consumers; import org.eclipse.emf.ecore.EObject; -import org.eclipse.xtext.parser.packrat.ICharSequenceWithOffset; -import org.eclipse.xtext.parser.packrat.IHiddenTokenHandler; -import org.eclipse.xtext.parser.packrat.IMarkerFactory; 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.consumers.INonTerminalConsumerConfiguration; import org.eclipse.xtext.parser.packrat.consumers.ConsumeResult; 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.parser.epatch.services.EpatchTestLanguageGrammarAccess; import org.eclipse.xtext.parser.epatch.services.EpatchTestLanguageGrammarAccess.EPatchElements; @@ -40,10 +36,8 @@ public final class EpatchTestLanguageEPatchConsumer extends NonTerminalConsumer private ISequenceMatcher ruleCall$9$Delimiter; - public EpatchTestLanguageEPatchConsumer(ICharSequenceWithOffset input, IMarkerFactory markerFactory, - IParsedTokenAcceptor tokenAcceptor, IHiddenTokenHandler hiddenTokenHandler, IConsumerUtility consumerUtil, - ITerminalConsumer[] hiddenTokens) { - super(input, markerFactory, tokenAcceptor, hiddenTokenHandler, consumerUtil, hiddenTokens); + public EpatchTestLanguageEPatchConsumer(INonTerminalConsumerConfiguration configuration, ITerminalConsumer[] hiddenTokens) { + super(configuration, hiddenTokens); keyword$10$Delimiter = ICharacterClass.Factory.nullClass(); keyword$17$Delimiter = ICharacterClass.Factory.nullClass(); keyword$7$Delimiter = ICharacterClass.Factory.nullClass(); diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageExecutableConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageExecutableConsumer.java index 4bf924f..00edbf2 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageExecutableConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageExecutableConsumer.java @@ -4,17 +4,13 @@ Generated with Xtext package org.eclipse.xtext.parser.epatch.parser.packrat.consumers; import org.eclipse.emf.ecore.EObject; -import org.eclipse.xtext.parser.packrat.ICharSequenceWithOffset; -import org.eclipse.xtext.parser.packrat.IHiddenTokenHandler; -import org.eclipse.xtext.parser.packrat.IMarkerFactory; 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.consumers.INonTerminalConsumerConfiguration; import org.eclipse.xtext.parser.packrat.consumers.ConsumeResult; 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.parser.epatch.services.EpatchTestLanguageGrammarAccess; import org.eclipse.xtext.parser.epatch.services.EpatchTestLanguageGrammarAccess.ExecutableElements; @@ -28,10 +24,8 @@ public final class EpatchTestLanguageExecutableConsumer extends NonTerminalConsu private EpatchTestLanguageExpressionExecutableConsumer expressionExecutableConsumer; private EpatchTestLanguageJavaExecutableConsumer javaExecutableConsumer; - public EpatchTestLanguageExecutableConsumer(ICharSequenceWithOffset input, IMarkerFactory markerFactory, - IParsedTokenAcceptor tokenAcceptor, IHiddenTokenHandler hiddenTokenHandler, IConsumerUtility consumerUtil, - ITerminalConsumer[] hiddenTokens) { - super(input, markerFactory, tokenAcceptor, hiddenTokenHandler, consumerUtil, hiddenTokens); + public EpatchTestLanguageExecutableConsumer(INonTerminalConsumerConfiguration configuration, ITerminalConsumer[] hiddenTokens) { + super(configuration, hiddenTokens); } protected int doConsume() throws Exception { diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageExpressionExecutableConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageExpressionExecutableConsumer.java index 74ce80d..4b02bf3 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageExpressionExecutableConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageExpressionExecutableConsumer.java @@ -4,17 +4,13 @@ Generated with Xtext package org.eclipse.xtext.parser.epatch.parser.packrat.consumers; import org.eclipse.emf.ecore.EObject; -import org.eclipse.xtext.parser.packrat.ICharSequenceWithOffset; -import org.eclipse.xtext.parser.packrat.IHiddenTokenHandler; -import org.eclipse.xtext.parser.packrat.IMarkerFactory; 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.consumers.INonTerminalConsumerConfiguration; import org.eclipse.xtext.parser.packrat.consumers.ConsumeResult; 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.parser.epatch.services.EpatchTestLanguageGrammarAccess; import org.eclipse.xtext.parser.epatch.services.EpatchTestLanguageGrammarAccess.ExpressionExecutableElements; @@ -28,10 +24,8 @@ public final class EpatchTestLanguageExpressionExecutableConsumer extends NonTer private ISequenceMatcher ruleCall$2$Delimiter; - public EpatchTestLanguageExpressionExecutableConsumer(ICharSequenceWithOffset input, IMarkerFactory markerFactory, - IParsedTokenAcceptor tokenAcceptor, IHiddenTokenHandler hiddenTokenHandler, IConsumerUtility consumerUtil, - ITerminalConsumer[] hiddenTokens) { - super(input, markerFactory, tokenAcceptor, hiddenTokenHandler, consumerUtil, hiddenTokens); + public EpatchTestLanguageExpressionExecutableConsumer(INonTerminalConsumerConfiguration configuration, ITerminalConsumer[] hiddenTokens) { + super(configuration, hiddenTokens); ruleCall$2$Delimiter = ISequenceMatcher.Factory.nullMatcher(); } diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageExtensionImportConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageExtensionImportConsumer.java index 7156c55..6c8354d 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageExtensionImportConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageExtensionImportConsumer.java @@ -4,17 +4,13 @@ Generated with Xtext package org.eclipse.xtext.parser.epatch.parser.packrat.consumers; import org.eclipse.emf.ecore.EObject; -import org.eclipse.xtext.parser.packrat.ICharSequenceWithOffset; -import org.eclipse.xtext.parser.packrat.IHiddenTokenHandler; -import org.eclipse.xtext.parser.packrat.IMarkerFactory; 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.consumers.INonTerminalConsumerConfiguration; import org.eclipse.xtext.parser.packrat.consumers.ConsumeResult; 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.parser.epatch.services.EpatchTestLanguageGrammarAccess; import org.eclipse.xtext.parser.epatch.services.EpatchTestLanguageGrammarAccess.ExtensionImportElements; @@ -36,10 +32,8 @@ public final class EpatchTestLanguageExtensionImportConsumer extends NonTerminal private ISequenceMatcher ruleCall$11$Delimiter; - public EpatchTestLanguageExtensionImportConsumer(ICharSequenceWithOffset input, IMarkerFactory markerFactory, - IParsedTokenAcceptor tokenAcceptor, IHiddenTokenHandler hiddenTokenHandler, IConsumerUtility consumerUtil, - ITerminalConsumer[] hiddenTokens) { - super(input, markerFactory, tokenAcceptor, hiddenTokenHandler, consumerUtil, hiddenTokens); + public EpatchTestLanguageExtensionImportConsumer(INonTerminalConsumerConfiguration configuration, ITerminalConsumer[] hiddenTokens) { + super(configuration, hiddenTokens); keyword$4$Delimiter = ICharacterClass.Factory.nullClass(); keyword$5$Delimiter = ICharacterClass.Factory.nullClass(); keyword$9$Delimiter = ICharacterClass.Factory.nullClass(); diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageImportConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageImportConsumer.java index 6249b8b..99521d7 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageImportConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageImportConsumer.java @@ -4,17 +4,13 @@ Generated with Xtext package org.eclipse.xtext.parser.epatch.parser.packrat.consumers; import org.eclipse.emf.ecore.EObject; -import org.eclipse.xtext.parser.packrat.ICharSequenceWithOffset; -import org.eclipse.xtext.parser.packrat.IHiddenTokenHandler; -import org.eclipse.xtext.parser.packrat.IMarkerFactory; 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.consumers.INonTerminalConsumerConfiguration; import org.eclipse.xtext.parser.packrat.consumers.ConsumeResult; 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.parser.epatch.services.EpatchTestLanguageGrammarAccess; import org.eclipse.xtext.parser.epatch.services.EpatchTestLanguageGrammarAccess.ImportElements; @@ -30,10 +26,8 @@ public final class EpatchTestLanguageImportConsumer extends NonTerminalConsumer private EpatchTestLanguageJavaImportConsumer javaImportConsumer; private EpatchTestLanguageModelImportConsumer modelImportConsumer; - public EpatchTestLanguageImportConsumer(ICharSequenceWithOffset input, IMarkerFactory markerFactory, - IParsedTokenAcceptor tokenAcceptor, IHiddenTokenHandler hiddenTokenHandler, IConsumerUtility consumerUtil, - ITerminalConsumer[] hiddenTokens) { - super(input, markerFactory, tokenAcceptor, hiddenTokenHandler, consumerUtil, hiddenTokens); + public EpatchTestLanguageImportConsumer(INonTerminalConsumerConfiguration configuration, ITerminalConsumer[] hiddenTokens) { + super(configuration, hiddenTokens); } protected int doConsume() throws Exception { diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageJavaExecutableConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageJavaExecutableConsumer.java index 184ec7a..151135f 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageJavaExecutableConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageJavaExecutableConsumer.java @@ -4,17 +4,13 @@ Generated with Xtext package org.eclipse.xtext.parser.epatch.parser.packrat.consumers; import org.eclipse.emf.ecore.EObject; -import org.eclipse.xtext.parser.packrat.ICharSequenceWithOffset; -import org.eclipse.xtext.parser.packrat.IHiddenTokenHandler; -import org.eclipse.xtext.parser.packrat.IMarkerFactory; 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.consumers.INonTerminalConsumerConfiguration; import org.eclipse.xtext.parser.packrat.consumers.ConsumeResult; 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.parser.epatch.services.EpatchTestLanguageGrammarAccess; import org.eclipse.xtext.parser.epatch.services.EpatchTestLanguageGrammarAccess.JavaExecutableElements; @@ -34,10 +30,8 @@ public final class EpatchTestLanguageJavaExecutableConsumer extends NonTerminalC private ISequenceMatcher ruleCall$6$Delimiter; - public EpatchTestLanguageJavaExecutableConsumer(ICharSequenceWithOffset input, IMarkerFactory markerFactory, - IParsedTokenAcceptor tokenAcceptor, IHiddenTokenHandler hiddenTokenHandler, IConsumerUtility consumerUtil, - ITerminalConsumer[] hiddenTokens) { - super(input, markerFactory, tokenAcceptor, hiddenTokenHandler, consumerUtil, hiddenTokens); + public EpatchTestLanguageJavaExecutableConsumer(INonTerminalConsumerConfiguration configuration, ITerminalConsumer[] hiddenTokens) { + super(configuration, hiddenTokens); keyword$4$Delimiter = ICharacterClass.Factory.nullClass(); keyword$7$Delimiter = ICharacterClass.Factory.nullClass(); keyword$8$Delimiter = ICharacterClass.Factory.nullClass(); diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageJavaImportConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageJavaImportConsumer.java index 711d77e..3e7c638 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageJavaImportConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageJavaImportConsumer.java @@ -4,17 +4,13 @@ Generated with Xtext package org.eclipse.xtext.parser.epatch.parser.packrat.consumers; import org.eclipse.emf.ecore.EObject; -import org.eclipse.xtext.parser.packrat.ICharSequenceWithOffset; -import org.eclipse.xtext.parser.packrat.IHiddenTokenHandler; -import org.eclipse.xtext.parser.packrat.IMarkerFactory; 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.consumers.INonTerminalConsumerConfiguration; import org.eclipse.xtext.parser.packrat.consumers.ConsumeResult; 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.parser.epatch.services.EpatchTestLanguageGrammarAccess; import org.eclipse.xtext.parser.epatch.services.EpatchTestLanguageGrammarAccess.JavaImportElements; @@ -36,10 +32,8 @@ public final class EpatchTestLanguageJavaImportConsumer extends NonTerminalConsu private ISequenceMatcher ruleCall$11$Delimiter; - public EpatchTestLanguageJavaImportConsumer(ICharSequenceWithOffset input, IMarkerFactory markerFactory, - IParsedTokenAcceptor tokenAcceptor, IHiddenTokenHandler hiddenTokenHandler, IConsumerUtility consumerUtil, - ITerminalConsumer[] hiddenTokens) { - super(input, markerFactory, tokenAcceptor, hiddenTokenHandler, consumerUtil, hiddenTokens); + public EpatchTestLanguageJavaImportConsumer(INonTerminalConsumerConfiguration configuration, ITerminalConsumer[] hiddenTokens) { + super(configuration, hiddenTokens); keyword$4$Delimiter = ICharacterClass.Factory.nullClass(); keyword$5$Delimiter = ICharacterClass.Factory.nullClass(); keyword$9$Delimiter = ICharacterClass.Factory.nullClass(); diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageListAssignmentValueConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageListAssignmentValueConsumer.java index 168fc96..592caa5 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageListAssignmentValueConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageListAssignmentValueConsumer.java @@ -4,17 +4,13 @@ Generated with Xtext package org.eclipse.xtext.parser.epatch.parser.packrat.consumers; import org.eclipse.emf.ecore.EObject; -import org.eclipse.xtext.parser.packrat.ICharSequenceWithOffset; -import org.eclipse.xtext.parser.packrat.IHiddenTokenHandler; -import org.eclipse.xtext.parser.packrat.IMarkerFactory; 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.consumers.INonTerminalConsumerConfiguration; import org.eclipse.xtext.parser.packrat.consumers.ConsumeResult; 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.parser.epatch.services.EpatchTestLanguageGrammarAccess; import org.eclipse.xtext.parser.epatch.services.EpatchTestLanguageGrammarAccess.ListAssignmentValueElements; @@ -62,10 +58,8 @@ public final class EpatchTestLanguageListAssignmentValueConsumer extends NonTerm private ISequenceMatcher ruleCall$40$Delimiter; - public EpatchTestLanguageListAssignmentValueConsumer(ICharSequenceWithOffset input, IMarkerFactory markerFactory, - IParsedTokenAcceptor tokenAcceptor, IHiddenTokenHandler hiddenTokenHandler, IConsumerUtility consumerUtil, - ITerminalConsumer[] hiddenTokens) { - super(input, markerFactory, tokenAcceptor, hiddenTokenHandler, consumerUtil, hiddenTokens); + public EpatchTestLanguageListAssignmentValueConsumer(INonTerminalConsumerConfiguration configuration, ITerminalConsumer[] hiddenTokens) { + super(configuration, hiddenTokens); crossReference$20$Delimiter = ISequenceMatcher.Factory.nullMatcher(); crossReference$37$Delimiter = ISequenceMatcher.Factory.nullMatcher(); keyword$5$Delimiter = ICharacterClass.Factory.nullClass(); diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageMigrationConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageMigrationConsumer.java index 7064cf2..224f2dc 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageMigrationConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageMigrationConsumer.java @@ -4,17 +4,13 @@ Generated with Xtext package org.eclipse.xtext.parser.epatch.parser.packrat.consumers; import org.eclipse.emf.ecore.EObject; -import org.eclipse.xtext.parser.packrat.ICharSequenceWithOffset; -import org.eclipse.xtext.parser.packrat.IHiddenTokenHandler; -import org.eclipse.xtext.parser.packrat.IMarkerFactory; 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.consumers.INonTerminalConsumerConfiguration; import org.eclipse.xtext.parser.packrat.consumers.ConsumeResult; 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.parser.epatch.services.EpatchTestLanguageGrammarAccess; import org.eclipse.xtext.parser.epatch.services.EpatchTestLanguageGrammarAccess.MigrationElements; @@ -34,10 +30,8 @@ public final class EpatchTestLanguageMigrationConsumer extends NonTerminalConsum private ICharacterClass keyword$16$Delimiter; - public EpatchTestLanguageMigrationConsumer(ICharSequenceWithOffset input, IMarkerFactory markerFactory, - IParsedTokenAcceptor tokenAcceptor, IHiddenTokenHandler hiddenTokenHandler, IConsumerUtility consumerUtil, - ITerminalConsumer[] hiddenTokens) { - super(input, markerFactory, tokenAcceptor, hiddenTokenHandler, consumerUtil, hiddenTokens); + public EpatchTestLanguageMigrationConsumer(INonTerminalConsumerConfiguration configuration, ITerminalConsumer[] hiddenTokens) { + super(configuration, hiddenTokens); keyword$4$Delimiter = ICharacterClass.Factory.nullClass(); keyword$9$Delimiter = ICharacterClass.Factory.nullClass(); keyword$13$Delimiter = ICharacterClass.Factory.nullClass(); diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageModelImportConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageModelImportConsumer.java index 8ff54f7..48896e7 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageModelImportConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageModelImportConsumer.java @@ -4,17 +4,13 @@ Generated with Xtext package org.eclipse.xtext.parser.epatch.parser.packrat.consumers; import org.eclipse.emf.ecore.EObject; -import org.eclipse.xtext.parser.packrat.ICharSequenceWithOffset; -import org.eclipse.xtext.parser.packrat.IHiddenTokenHandler; -import org.eclipse.xtext.parser.packrat.IMarkerFactory; 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.consumers.INonTerminalConsumerConfiguration; import org.eclipse.xtext.parser.packrat.consumers.ConsumeResult; 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.parser.epatch.services.EpatchTestLanguageGrammarAccess; import org.eclipse.xtext.parser.epatch.services.EpatchTestLanguageGrammarAccess.ModelImportElements; @@ -28,10 +24,8 @@ public final class EpatchTestLanguageModelImportConsumer extends NonTerminalCons private EpatchTestLanguageEPackageImportConsumer ePackageImportConsumer; private EpatchTestLanguageResourceImportConsumer resourceImportConsumer; - public EpatchTestLanguageModelImportConsumer(ICharSequenceWithOffset input, IMarkerFactory markerFactory, - IParsedTokenAcceptor tokenAcceptor, IHiddenTokenHandler hiddenTokenHandler, IConsumerUtility consumerUtil, - ITerminalConsumer[] hiddenTokens) { - super(input, markerFactory, tokenAcceptor, hiddenTokenHandler, consumerUtil, hiddenTokens); + public EpatchTestLanguageModelImportConsumer(INonTerminalConsumerConfiguration configuration, ITerminalConsumer[] hiddenTokens) { + super(configuration, hiddenTokens); } protected int doConsume() throws Exception { diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageMonoListAssignmentConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageMonoListAssignmentConsumer.java index 95e94f3..0895007 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageMonoListAssignmentConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageMonoListAssignmentConsumer.java @@ -4,17 +4,13 @@ Generated with Xtext package org.eclipse.xtext.parser.epatch.parser.packrat.consumers; import org.eclipse.emf.ecore.EObject; -import org.eclipse.xtext.parser.packrat.ICharSequenceWithOffset; -import org.eclipse.xtext.parser.packrat.IHiddenTokenHandler; -import org.eclipse.xtext.parser.packrat.IMarkerFactory; 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.consumers.INonTerminalConsumerConfiguration; import org.eclipse.xtext.parser.packrat.consumers.ConsumeResult; 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.parser.epatch.services.EpatchTestLanguageGrammarAccess; import org.eclipse.xtext.parser.epatch.services.EpatchTestLanguageGrammarAccess.MonoListAssignmentElements; @@ -40,10 +36,8 @@ public final class EpatchTestLanguageMonoListAssignmentConsumer extends NonTermi private ISequenceMatcher ruleCall$7$Delimiter; - public EpatchTestLanguageMonoListAssignmentConsumer(ICharSequenceWithOffset input, IMarkerFactory markerFactory, - IParsedTokenAcceptor tokenAcceptor, IHiddenTokenHandler hiddenTokenHandler, IConsumerUtility consumerUtil, - ITerminalConsumer[] hiddenTokens) { - super(input, markerFactory, tokenAcceptor, hiddenTokenHandler, consumerUtil, hiddenTokens); + public EpatchTestLanguageMonoListAssignmentConsumer(INonTerminalConsumerConfiguration configuration, ITerminalConsumer[] hiddenTokens) { + super(configuration, hiddenTokens); keyword$8$Delimiter = ICharacterClass.Factory.nullClass(); keyword$9$Delimiter = ICharacterClass.Factory.nullClass(); keyword$14$Delimiter = ICharacterClass.Factory.nullClass(); diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageMonoSingleAssignmentConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageMonoSingleAssignmentConsumer.java index 4497528..1ae2193 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageMonoSingleAssignmentConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageMonoSingleAssignmentConsumer.java @@ -4,17 +4,13 @@ Generated with Xtext package org.eclipse.xtext.parser.epatch.parser.packrat.consumers; import org.eclipse.emf.ecore.EObject; -import org.eclipse.xtext.parser.packrat.ICharSequenceWithOffset; -import org.eclipse.xtext.parser.packrat.IHiddenTokenHandler; -import org.eclipse.xtext.parser.packrat.IMarkerFactory; 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.consumers.INonTerminalConsumerConfiguration; import org.eclipse.xtext.parser.packrat.consumers.ConsumeResult; 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.parser.epatch.services.EpatchTestLanguageGrammarAccess; import org.eclipse.xtext.parser.epatch.services.EpatchTestLanguageGrammarAccess.MonoSingleAssignmentElements; @@ -34,10 +30,8 @@ public final class EpatchTestLanguageMonoSingleAssignmentConsumer extends NonTer private ISequenceMatcher ruleCall$5$Delimiter; - public EpatchTestLanguageMonoSingleAssignmentConsumer(ICharSequenceWithOffset input, IMarkerFactory markerFactory, - IParsedTokenAcceptor tokenAcceptor, IHiddenTokenHandler hiddenTokenHandler, IConsumerUtility consumerUtil, - ITerminalConsumer[] hiddenTokens) { - super(input, markerFactory, tokenAcceptor, hiddenTokenHandler, consumerUtil, hiddenTokens); + public EpatchTestLanguageMonoSingleAssignmentConsumer(INonTerminalConsumerConfiguration configuration, ITerminalConsumer[] hiddenTokens) { + super(configuration, hiddenTokens); keyword$6$Delimiter = ICharacterClass.Factory.nullClass(); keyword$9$Delimiter = ICharacterClass.Factory.nullClass(); ruleCall$5$Delimiter = ISequenceMatcher.Factory.nullMatcher(); diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageNamedObjectConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageNamedObjectConsumer.java index f9a343f..17adaec 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageNamedObjectConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageNamedObjectConsumer.java @@ -4,17 +4,13 @@ Generated with Xtext package org.eclipse.xtext.parser.epatch.parser.packrat.consumers; import org.eclipse.emf.ecore.EObject; -import org.eclipse.xtext.parser.packrat.ICharSequenceWithOffset; -import org.eclipse.xtext.parser.packrat.IHiddenTokenHandler; -import org.eclipse.xtext.parser.packrat.IMarkerFactory; 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.consumers.INonTerminalConsumerConfiguration; import org.eclipse.xtext.parser.packrat.consumers.ConsumeResult; 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.parser.epatch.services.EpatchTestLanguageGrammarAccess; import org.eclipse.xtext.parser.epatch.services.EpatchTestLanguageGrammarAccess.NamedObjectElements; @@ -28,10 +24,8 @@ public final class EpatchTestLanguageNamedObjectConsumer extends NonTerminalCons private EpatchTestLanguageCreatedObjectConsumer createdObjectConsumer; private EpatchTestLanguageObjectRefConsumer objectRefConsumer; - public EpatchTestLanguageNamedObjectConsumer(ICharSequenceWithOffset input, IMarkerFactory markerFactory, - IParsedTokenAcceptor tokenAcceptor, IHiddenTokenHandler hiddenTokenHandler, IConsumerUtility consumerUtil, - ITerminalConsumer[] hiddenTokens) { - super(input, markerFactory, tokenAcceptor, hiddenTokenHandler, consumerUtil, hiddenTokens); + public EpatchTestLanguageNamedObjectConsumer(INonTerminalConsumerConfiguration configuration, ITerminalConsumer[] hiddenTokens) { + super(configuration, hiddenTokens); } protected int doConsume() throws Exception { diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageNamedResourceConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageNamedResourceConsumer.java index fcd4a56..4b73c08 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageNamedResourceConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageNamedResourceConsumer.java @@ -4,17 +4,13 @@ Generated with Xtext package org.eclipse.xtext.parser.epatch.parser.packrat.consumers; import org.eclipse.emf.ecore.EObject; -import org.eclipse.xtext.parser.packrat.ICharSequenceWithOffset; -import org.eclipse.xtext.parser.packrat.IHiddenTokenHandler; -import org.eclipse.xtext.parser.packrat.IMarkerFactory; 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.consumers.INonTerminalConsumerConfiguration; import org.eclipse.xtext.parser.packrat.consumers.ConsumeResult; 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.parser.epatch.services.EpatchTestLanguageGrammarAccess; import org.eclipse.xtext.parser.epatch.services.EpatchTestLanguageGrammarAccess.NamedResourceElements; @@ -54,10 +50,8 @@ public final class EpatchTestLanguageNamedResourceConsumer extends NonTerminalCo private ISequenceMatcher ruleCall$12$Delimiter; - public EpatchTestLanguageNamedResourceConsumer(ICharSequenceWithOffset input, IMarkerFactory markerFactory, - IParsedTokenAcceptor tokenAcceptor, IHiddenTokenHandler hiddenTokenHandler, IConsumerUtility consumerUtil, - ITerminalConsumer[] hiddenTokens) { - super(input, markerFactory, tokenAcceptor, hiddenTokenHandler, consumerUtil, hiddenTokens); + public EpatchTestLanguageNamedResourceConsumer(INonTerminalConsumerConfiguration configuration, ITerminalConsumer[] hiddenTokens) { + super(configuration, hiddenTokens); keyword$22$Delimiter = ICharacterClass.Factory.nullClass(); keyword$23$Delimiter = ICharacterClass.Factory.nullClass(); keyword$26$Delimiter = ICharacterClass.Factory.nullClass(); diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageObjectCopyConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageObjectCopyConsumer.java index ca11961..ceb837a 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageObjectCopyConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageObjectCopyConsumer.java @@ -4,17 +4,13 @@ Generated with Xtext package org.eclipse.xtext.parser.epatch.parser.packrat.consumers; import org.eclipse.emf.ecore.EObject; -import org.eclipse.xtext.parser.packrat.ICharSequenceWithOffset; -import org.eclipse.xtext.parser.packrat.IHiddenTokenHandler; -import org.eclipse.xtext.parser.packrat.IMarkerFactory; 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.consumers.INonTerminalConsumerConfiguration; import org.eclipse.xtext.parser.packrat.consumers.ConsumeResult; 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.parser.epatch.services.EpatchTestLanguageGrammarAccess; import org.eclipse.xtext.parser.epatch.services.EpatchTestLanguageGrammarAccess.ObjectCopyElements; @@ -34,10 +30,8 @@ public final class EpatchTestLanguageObjectCopyConsumer extends NonTerminalConsu private ISequenceMatcher ruleCall$8$Delimiter; - public EpatchTestLanguageObjectCopyConsumer(ICharSequenceWithOffset input, IMarkerFactory markerFactory, - IParsedTokenAcceptor tokenAcceptor, IHiddenTokenHandler hiddenTokenHandler, IConsumerUtility consumerUtil, - ITerminalConsumer[] hiddenTokens) { - super(input, markerFactory, tokenAcceptor, hiddenTokenHandler, consumerUtil, hiddenTokens); + public EpatchTestLanguageObjectCopyConsumer(INonTerminalConsumerConfiguration configuration, ITerminalConsumer[] hiddenTokens) { + super(configuration, hiddenTokens); crossReference$5$Delimiter = ISequenceMatcher.Factory.nullMatcher(); keyword$3$Delimiter = ICharacterClass.Factory.nullClass(); ruleCall$8$Delimiter = ISequenceMatcher.Factory.nullMatcher(); diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageObjectNewConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageObjectNewConsumer.java index 9fb553d..db8554d 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageObjectNewConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageObjectNewConsumer.java @@ -4,17 +4,13 @@ Generated with Xtext package org.eclipse.xtext.parser.epatch.parser.packrat.consumers; import org.eclipse.emf.ecore.EObject; -import org.eclipse.xtext.parser.packrat.ICharSequenceWithOffset; -import org.eclipse.xtext.parser.packrat.IHiddenTokenHandler; -import org.eclipse.xtext.parser.packrat.IMarkerFactory; 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.consumers.INonTerminalConsumerConfiguration; import org.eclipse.xtext.parser.packrat.consumers.ConsumeResult; 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.parser.epatch.services.EpatchTestLanguageGrammarAccess; import org.eclipse.xtext.parser.epatch.services.EpatchTestLanguageGrammarAccess.ObjectNewElements; @@ -34,10 +30,8 @@ public final class EpatchTestLanguageObjectNewConsumer extends NonTerminalConsum private ISequenceMatcher ruleCall$8$Delimiter; - public EpatchTestLanguageObjectNewConsumer(ICharSequenceWithOffset input, IMarkerFactory markerFactory, - IParsedTokenAcceptor tokenAcceptor, IHiddenTokenHandler hiddenTokenHandler, IConsumerUtility consumerUtil, - ITerminalConsumer[] hiddenTokens) { - super(input, markerFactory, tokenAcceptor, hiddenTokenHandler, consumerUtil, hiddenTokens); + public EpatchTestLanguageObjectNewConsumer(INonTerminalConsumerConfiguration configuration, ITerminalConsumer[] hiddenTokens) { + super(configuration, hiddenTokens); crossReference$5$Delimiter = ISequenceMatcher.Factory.nullMatcher(); keyword$3$Delimiter = ICharacterClass.Factory.nullClass(); ruleCall$8$Delimiter = ISequenceMatcher.Factory.nullMatcher(); diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageObjectRefConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageObjectRefConsumer.java index 9cf8a33..853a3ea 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageObjectRefConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageObjectRefConsumer.java @@ -4,17 +4,13 @@ Generated with Xtext package org.eclipse.xtext.parser.epatch.parser.packrat.consumers; import org.eclipse.emf.ecore.EObject; -import org.eclipse.xtext.parser.packrat.ICharSequenceWithOffset; -import org.eclipse.xtext.parser.packrat.IHiddenTokenHandler; -import org.eclipse.xtext.parser.packrat.IMarkerFactory; 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.consumers.INonTerminalConsumerConfiguration; import org.eclipse.xtext.parser.packrat.consumers.ConsumeResult; 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.parser.epatch.services.EpatchTestLanguageGrammarAccess; import org.eclipse.xtext.parser.epatch.services.EpatchTestLanguageGrammarAccess.ObjectRefElements; @@ -62,10 +58,8 @@ public final class EpatchTestLanguageObjectRefConsumer extends NonTerminalConsum private ISequenceMatcher ruleCall$30$Delimiter; - public EpatchTestLanguageObjectRefConsumer(ICharSequenceWithOffset input, IMarkerFactory markerFactory, - IParsedTokenAcceptor tokenAcceptor, IHiddenTokenHandler hiddenTokenHandler, IConsumerUtility consumerUtil, - ITerminalConsumer[] hiddenTokens) { - super(input, markerFactory, tokenAcceptor, hiddenTokenHandler, consumerUtil, hiddenTokens); + public EpatchTestLanguageObjectRefConsumer(INonTerminalConsumerConfiguration configuration, ITerminalConsumer[] hiddenTokens) { + super(configuration, hiddenTokens); crossReference$10$Delimiter = ISequenceMatcher.Factory.nullMatcher(); crossReference$21$Delimiter = ISequenceMatcher.Factory.nullMatcher(); crossReference$27$Delimiter = ISequenceMatcher.Factory.nullMatcher(); diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageResourceImportConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageResourceImportConsumer.java index ae4650a..b72228f 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageResourceImportConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageResourceImportConsumer.java @@ -4,17 +4,13 @@ Generated with Xtext package org.eclipse.xtext.parser.epatch.parser.packrat.consumers; import org.eclipse.emf.ecore.EObject; -import org.eclipse.xtext.parser.packrat.ICharSequenceWithOffset; -import org.eclipse.xtext.parser.packrat.IHiddenTokenHandler; -import org.eclipse.xtext.parser.packrat.IMarkerFactory; 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.consumers.INonTerminalConsumerConfiguration; import org.eclipse.xtext.parser.packrat.consumers.ConsumeResult; 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.parser.epatch.services.EpatchTestLanguageGrammarAccess; import org.eclipse.xtext.parser.epatch.services.EpatchTestLanguageGrammarAccess.ResourceImportElements; @@ -36,10 +32,8 @@ public final class EpatchTestLanguageResourceImportConsumer extends NonTerminalC private ISequenceMatcher ruleCall$9$Delimiter; - public EpatchTestLanguageResourceImportConsumer(ICharSequenceWithOffset input, IMarkerFactory markerFactory, - IParsedTokenAcceptor tokenAcceptor, IHiddenTokenHandler hiddenTokenHandler, IConsumerUtility consumerUtil, - ITerminalConsumer[] hiddenTokens) { - super(input, markerFactory, tokenAcceptor, hiddenTokenHandler, consumerUtil, hiddenTokens); + public EpatchTestLanguageResourceImportConsumer(INonTerminalConsumerConfiguration configuration, ITerminalConsumer[] hiddenTokens) { + super(configuration, hiddenTokens); keyword$4$Delimiter = ICharacterClass.Factory.nullClass(); keyword$7$Delimiter = ICharacterClass.Factory.nullClass(); ruleCall$6$Delimiter = ISequenceMatcher.Factory.nullMatcher(); diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageSingleAssignmentValueConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageSingleAssignmentValueConsumer.java index c311a7f..3a41e8a 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageSingleAssignmentValueConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/parser/packrat/consumers/EpatchTestLanguageSingleAssignmentValueConsumer.java @@ -4,17 +4,13 @@ Generated with Xtext package org.eclipse.xtext.parser.epatch.parser.packrat.consumers; import org.eclipse.emf.ecore.EObject; -import org.eclipse.xtext.parser.packrat.ICharSequenceWithOffset; -import org.eclipse.xtext.parser.packrat.IHiddenTokenHandler; -import org.eclipse.xtext.parser.packrat.IMarkerFactory; 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.consumers.INonTerminalConsumerConfiguration; import org.eclipse.xtext.parser.packrat.consumers.ConsumeResult; 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.parser.epatch.services.EpatchTestLanguageGrammarAccess; import org.eclipse.xtext.parser.epatch.services.EpatchTestLanguageGrammarAccess.SingleAssignmentValueElements; @@ -54,10 +50,8 @@ public final class EpatchTestLanguageSingleAssignmentValueConsumer extends NonTe private ISequenceMatcher ruleCall$31$Delimiter; - public EpatchTestLanguageSingleAssignmentValueConsumer(ICharSequenceWithOffset input, IMarkerFactory markerFactory, - IParsedTokenAcceptor tokenAcceptor, IHiddenTokenHandler hiddenTokenHandler, IConsumerUtility consumerUtil, - ITerminalConsumer[] hiddenTokens) { - super(input, markerFactory, tokenAcceptor, hiddenTokenHandler, consumerUtil, hiddenTokens); + public EpatchTestLanguageSingleAssignmentValueConsumer(INonTerminalConsumerConfiguration configuration, ITerminalConsumer[] hiddenTokens) { + super(configuration, hiddenTokens); crossReference$11$Delimiter = ISequenceMatcher.Factory.nullMatcher(); crossReference$28$Delimiter = ISequenceMatcher.Factory.nullMatcher(); keyword$6$Delimiter = ICharacterClass.Factory.nullClass(); diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/XtextGrammarTestLanguagePackratParser.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/XtextGrammarTestLanguagePackratParser.java index 264dcc7..6270011 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/XtextGrammarTestLanguagePackratParser.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/XtextGrammarTestLanguagePackratParser.java @@ -4,19 +4,13 @@ Generated with Xtext package org.eclipse.xtext.parser.packrat; import org.eclipse.xtext.parser.packrat.AbstractPackratParser; -import org.eclipse.xtext.parser.packrat.ICharSequenceWithOffset; -import org.eclipse.xtext.parser.packrat.IHiddenTokenHandler; -import org.eclipse.xtext.parser.packrat.IMarkerFactory; -import org.eclipse.xtext.parser.packrat.consumers.IConsumerUtility; -import org.eclipse.xtext.parser.packrat.tokens.IParsedTokenAcceptor; +import org.eclipse.xtext.parser.packrat.AbstractParserConfiguration.IInternalParserConfiguration; public class XtextGrammarTestLanguagePackratParser extends AbstractPackratParser { @Override - protected XtextGrammarTestLanguageParserConfiguration createParserConfiguration(ICharSequenceWithOffset input, - IMarkerFactory markerFactory, IParsedTokenAcceptor tokenAcceptor, IHiddenTokenHandler hiddenTokenHandler, - IConsumerUtility consumerUtil) { - return new XtextGrammarTestLanguageParserConfiguration(input, markerFactory, tokenAcceptor, hiddenTokenHandler, consumerUtil); + protected XtextGrammarTestLanguageParserConfiguration createParserConfiguration(IInternalParserConfiguration configuration) { + return new XtextGrammarTestLanguageParserConfiguration(configuration); } } diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/XtextGrammarTestLanguageParserConfiguration.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/XtextGrammarTestLanguageParserConfiguration.java index cdad6bc..b6c5e9f 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/XtextGrammarTestLanguageParserConfiguration.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/XtextGrammarTestLanguageParserConfiguration.java @@ -4,13 +4,7 @@ Generated with Xtext package org.eclipse.xtext.parser.packrat; import org.eclipse.xtext.parser.packrat.AbstractParserConfiguration; -import org.eclipse.xtext.parser.packrat.ICharSequenceWithOffset; -import org.eclipse.xtext.parser.packrat.IHiddenTokenHandler; -import org.eclipse.xtext.parser.packrat.IMarkerFactory; -import org.eclipse.xtext.parser.packrat.consumers.IConsumerUtility; -import org.eclipse.xtext.parser.packrat.consumers.INonTerminalConsumer; import org.eclipse.xtext.parser.packrat.consumers.ITerminalConsumer; -import org.eclipse.xtext.parser.packrat.tokens.IParsedTokenAcceptor; import org.eclipse.xtext.builtin.parser.packrat.XtextBuiltinParserConfiguration; @@ -51,6 +45,7 @@ import org.eclipse.xtext.builtin.parser.packrat.consumers.XtextBuiltinSL_COMMENT import org.eclipse.xtext.builtin.parser.packrat.consumers.XtextBuiltinWSConsumer; import org.eclipse.xtext.builtin.parser.packrat.consumers.XtextBuiltinANY_OTHERConsumer; +@SuppressWarnings("unused") public class XtextGrammarTestLanguageParserConfiguration extends AbstractParserConfiguration { private XtextBuiltinParserConfiguration xtextBuiltinConfiguration; @@ -85,11 +80,9 @@ public class XtextGrammarTestLanguageParserConfiguration extends AbstractParserC private XtextGrammarTestLanguageKeywordConsumer keywordConsumer; private XtextGrammarTestLanguageRuleCallConsumer ruleCallConsumer; - public XtextGrammarTestLanguageParserConfiguration(ICharSequenceWithOffset input, IMarkerFactory markerFactory, - IParsedTokenAcceptor tokenAcceptor, IHiddenTokenHandler hiddenTokenHandler, IConsumerUtility consumerUtil) { - super(input, markerFactory, tokenAcceptor, hiddenTokenHandler, consumerUtil); - this.xtextBuiltinConfiguration = new XtextBuiltinParserConfiguration( - input, markerFactory, tokenAcceptor, hiddenTokenHandler, consumerUtil); + public XtextGrammarTestLanguageParserConfiguration(IInternalParserConfiguration configuration) { + super(configuration); + this.xtextBuiltinConfiguration = new XtextBuiltinParserConfiguration(configuration); } public XtextGrammarTestLanguageGrammarConsumer getRootConsumer() { @@ -99,92 +92,91 @@ public class XtextGrammarTestLanguageParserConfiguration extends AbstractParserC public void createNonTerminalConsumers() { getXtextBuiltinConfiguration().createNonTerminalConsumers(); grammarConsumer = new XtextGrammarTestLanguageGrammarConsumer( - getInput(), getMarkerFactory(), getTokenAcceptor(), getHiddenTokenHandler(), getConsumerUtil(), - new ITerminalConsumer[]{ getWsConsumer(), getMlCommentConsumer(), getSlCommentConsumer() } + this, new ITerminalConsumer[]{ getWsConsumer(), getMlCommentConsumer(), getSlCommentConsumer() } ); abstractRuleConsumer = new XtextGrammarTestLanguageAbstractRuleConsumer( - getInput(), getMarkerFactory(), getTokenAcceptor(), getHiddenTokenHandler(), getConsumerUtil(), null + this, null ); abstractMetamodelDeclarationConsumer = new XtextGrammarTestLanguageAbstractMetamodelDeclarationConsumer( - getInput(), getMarkerFactory(), getTokenAcceptor(), getHiddenTokenHandler(), getConsumerUtil(), null + this, null ); generatedMetamodelConsumer = new XtextGrammarTestLanguageGeneratedMetamodelConsumer( - getInput(), getMarkerFactory(), getTokenAcceptor(), getHiddenTokenHandler(), getConsumerUtil(), null + this, null ); referencedMetamodelConsumer = new XtextGrammarTestLanguageReferencedMetamodelConsumer( - getInput(), getMarkerFactory(), getTokenAcceptor(), getHiddenTokenHandler(), getConsumerUtil(), null + this, null ); lexerRuleConsumer = new XtextGrammarTestLanguageLexerRuleConsumer( - getInput(), getMarkerFactory(), getTokenAcceptor(), getHiddenTokenHandler(), getConsumerUtil(), null + this, null ); parserRuleConsumer = new XtextGrammarTestLanguageParserRuleConsumer( - getInput(), getMarkerFactory(), getTokenAcceptor(), getHiddenTokenHandler(), getConsumerUtil(), null + this, null ); terminalRuleConsumer = new XtextGrammarTestLanguageTerminalRuleConsumer( - getInput(), getMarkerFactory(), getTokenAcceptor(), getHiddenTokenHandler(), getConsumerUtil(), null + this, null ); typeRefConsumer = new XtextGrammarTestLanguageTypeRefConsumer( - getInput(), getMarkerFactory(), getTokenAcceptor(), getHiddenTokenHandler(), getConsumerUtil(), null + this, null ); alternativesConsumer = new XtextGrammarTestLanguageAlternativesConsumer( - getInput(), getMarkerFactory(), getTokenAcceptor(), getHiddenTokenHandler(), getConsumerUtil(), null + this, null ); terminalAlternativesConsumer = new XtextGrammarTestLanguageTerminalAlternativesConsumer( - getInput(), getMarkerFactory(), getTokenAcceptor(), getHiddenTokenHandler(), getConsumerUtil(), null + this, null ); groupConsumer = new XtextGrammarTestLanguageGroupConsumer( - getInput(), getMarkerFactory(), getTokenAcceptor(), getHiddenTokenHandler(), getConsumerUtil(), null + this, null ); terminalGroupConsumer = new XtextGrammarTestLanguageTerminalGroupConsumer( - getInput(), getMarkerFactory(), getTokenAcceptor(), getHiddenTokenHandler(), getConsumerUtil(), null + this, null ); abstractTokenConsumer = new XtextGrammarTestLanguageAbstractTokenConsumer( - getInput(), getMarkerFactory(), getTokenAcceptor(), getHiddenTokenHandler(), getConsumerUtil(), null + this, null ); terminalTokenConsumer = new XtextGrammarTestLanguageTerminalTokenConsumer( - getInput(), getMarkerFactory(), getTokenAcceptor(), getHiddenTokenHandler(), getConsumerUtil(), null + this, null ); assignmentConsumer = new XtextGrammarTestLanguageAssignmentConsumer( - getInput(), getMarkerFactory(), getTokenAcceptor(), getHiddenTokenHandler(), getConsumerUtil(), null + this, null ); actionConsumer = new XtextGrammarTestLanguageActionConsumer( - getInput(), getMarkerFactory(), getTokenAcceptor(), getHiddenTokenHandler(), getConsumerUtil(), null + this, null ); abstractTerminalConsumer = new XtextGrammarTestLanguageAbstractTerminalConsumer( - getInput(), getMarkerFactory(), getTokenAcceptor(), getHiddenTokenHandler(), getConsumerUtil(), null + this, null ); terminalTokenElementConsumer = new XtextGrammarTestLanguageTerminalTokenElementConsumer( - getInput(), getMarkerFactory(), getTokenAcceptor(), getHiddenTokenHandler(), getConsumerUtil(), null + this, null ); abstractNegatedTokenConsumer = new XtextGrammarTestLanguageAbstractNegatedTokenConsumer( - getInput(), getMarkerFactory(), getTokenAcceptor(), getHiddenTokenHandler(), getConsumerUtil(), null + this, null ); negatedTokenConsumer = new XtextGrammarTestLanguageNegatedTokenConsumer( - getInput(), getMarkerFactory(), getTokenAcceptor(), getHiddenTokenHandler(), getConsumerUtil(), null + this, null ); upToTokenConsumer = new XtextGrammarTestLanguageUpToTokenConsumer( - getInput(), getMarkerFactory(), getTokenAcceptor(), getHiddenTokenHandler(), getConsumerUtil(), null + this, null ); wildcardConsumer = new XtextGrammarTestLanguageWildcardConsumer( - getInput(), getMarkerFactory(), getTokenAcceptor(), getHiddenTokenHandler(), getConsumerUtil(), null + this, null ); characterRangeConsumer = new XtextGrammarTestLanguageCharacterRangeConsumer( - getInput(), getMarkerFactory(), getTokenAcceptor(), getHiddenTokenHandler(), getConsumerUtil(), null + this, null ); crossReferenceConsumer = new XtextGrammarTestLanguageCrossReferenceConsumer( - getInput(), getMarkerFactory(), getTokenAcceptor(), getHiddenTokenHandler(), getConsumerUtil(), null + this, null ); parenthesizedElementConsumer = new XtextGrammarTestLanguageParenthesizedElementConsumer( - getInput(), getMarkerFactory(), getTokenAcceptor(), getHiddenTokenHandler(), getConsumerUtil(), null + this, null ); parenthesizedTerminalElementConsumer = new XtextGrammarTestLanguageParenthesizedTerminalElementConsumer( - getInput(), getMarkerFactory(), getTokenAcceptor(), getHiddenTokenHandler(), getConsumerUtil(), null + this, null ); keywordConsumer = new XtextGrammarTestLanguageKeywordConsumer( - getInput(), getMarkerFactory(), getTokenAcceptor(), getHiddenTokenHandler(), getConsumerUtil(), null + this, null ); ruleCallConsumer = new XtextGrammarTestLanguageRuleCallConsumer( - getInput(), getMarkerFactory(), getTokenAcceptor(), getHiddenTokenHandler(), getConsumerUtil(), null + this, null ); } diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageAbstractMetamodelDeclarationConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageAbstractMetamodelDeclarationConsumer.java index 9c3df93..40a4f85 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageAbstractMetamodelDeclarationConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageAbstractMetamodelDeclarationConsumer.java @@ -4,17 +4,13 @@ Generated with Xtext package org.eclipse.xtext.parser.packrat.consumers; import org.eclipse.emf.ecore.EObject; -import org.eclipse.xtext.parser.packrat.ICharSequenceWithOffset; -import org.eclipse.xtext.parser.packrat.IHiddenTokenHandler; -import org.eclipse.xtext.parser.packrat.IMarkerFactory; 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.consumers.INonTerminalConsumerConfiguration; import org.eclipse.xtext.parser.packrat.consumers.ConsumeResult; 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.services.XtextGrammarTestLanguageGrammarAccess; import org.eclipse.xtext.services.XtextGrammarTestLanguageGrammarAccess.AbstractMetamodelDeclarationElements; @@ -28,10 +24,8 @@ public final class XtextGrammarTestLanguageAbstractMetamodelDeclarationConsumer private XtextGrammarTestLanguageGeneratedMetamodelConsumer generatedMetamodelConsumer; private XtextGrammarTestLanguageReferencedMetamodelConsumer referencedMetamodelConsumer; - public XtextGrammarTestLanguageAbstractMetamodelDeclarationConsumer(ICharSequenceWithOffset input, IMarkerFactory markerFactory, - IParsedTokenAcceptor tokenAcceptor, IHiddenTokenHandler hiddenTokenHandler, IConsumerUtility consumerUtil, - ITerminalConsumer[] hiddenTokens) { - super(input, markerFactory, tokenAcceptor, hiddenTokenHandler, consumerUtil, hiddenTokens); + public XtextGrammarTestLanguageAbstractMetamodelDeclarationConsumer(INonTerminalConsumerConfiguration configuration, ITerminalConsumer[] hiddenTokens) { + super(configuration, hiddenTokens); } protected int doConsume() throws Exception { diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageAbstractNegatedTokenConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageAbstractNegatedTokenConsumer.java index 85276df..5155c87 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageAbstractNegatedTokenConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageAbstractNegatedTokenConsumer.java @@ -4,17 +4,13 @@ Generated with Xtext package org.eclipse.xtext.parser.packrat.consumers; import org.eclipse.emf.ecore.EObject; -import org.eclipse.xtext.parser.packrat.ICharSequenceWithOffset; -import org.eclipse.xtext.parser.packrat.IHiddenTokenHandler; -import org.eclipse.xtext.parser.packrat.IMarkerFactory; 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.consumers.INonTerminalConsumerConfiguration; import org.eclipse.xtext.parser.packrat.consumers.ConsumeResult; 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.services.XtextGrammarTestLanguageGrammarAccess; import org.eclipse.xtext.services.XtextGrammarTestLanguageGrammarAccess.AbstractNegatedTokenElements; @@ -28,10 +24,8 @@ public final class XtextGrammarTestLanguageAbstractNegatedTokenConsumer extends private XtextGrammarTestLanguageNegatedTokenConsumer negatedTokenConsumer; private XtextGrammarTestLanguageUpToTokenConsumer upToTokenConsumer; - public XtextGrammarTestLanguageAbstractNegatedTokenConsumer(ICharSequenceWithOffset input, IMarkerFactory markerFactory, - IParsedTokenAcceptor tokenAcceptor, IHiddenTokenHandler hiddenTokenHandler, IConsumerUtility consumerUtil, - ITerminalConsumer[] hiddenTokens) { - super(input, markerFactory, tokenAcceptor, hiddenTokenHandler, consumerUtil, hiddenTokens); + public XtextGrammarTestLanguageAbstractNegatedTokenConsumer(INonTerminalConsumerConfiguration configuration, ITerminalConsumer[] hiddenTokens) { + super(configuration, hiddenTokens); } protected int doConsume() throws Exception { diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageAbstractRuleConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageAbstractRuleConsumer.java index 3bbdadf..c4f1b53 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageAbstractRuleConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageAbstractRuleConsumer.java @@ -4,17 +4,13 @@ Generated with Xtext package org.eclipse.xtext.parser.packrat.consumers; import org.eclipse.emf.ecore.EObject; -import org.eclipse.xtext.parser.packrat.ICharSequenceWithOffset; -import org.eclipse.xtext.parser.packrat.IHiddenTokenHandler; -import org.eclipse.xtext.parser.packrat.IMarkerFactory; 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.consumers.INonTerminalConsumerConfiguration; import org.eclipse.xtext.parser.packrat.consumers.ConsumeResult; 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.services.XtextGrammarTestLanguageGrammarAccess; import org.eclipse.xtext.services.XtextGrammarTestLanguageGrammarAccess.AbstractRuleElements; @@ -30,10 +26,8 @@ public final class XtextGrammarTestLanguageAbstractRuleConsumer extends NonTermi private XtextGrammarTestLanguageParserRuleConsumer parserRuleConsumer; private XtextGrammarTestLanguageTerminalRuleConsumer terminalRuleConsumer; - public XtextGrammarTestLanguageAbstractRuleConsumer(ICharSequenceWithOffset input, IMarkerFactory markerFactory, - IParsedTokenAcceptor tokenAcceptor, IHiddenTokenHandler hiddenTokenHandler, IConsumerUtility consumerUtil, - ITerminalConsumer[] hiddenTokens) { - super(input, markerFactory, tokenAcceptor, hiddenTokenHandler, consumerUtil, hiddenTokens); + public XtextGrammarTestLanguageAbstractRuleConsumer(INonTerminalConsumerConfiguration configuration, ITerminalConsumer[] hiddenTokens) { + super(configuration, hiddenTokens); } protected int doConsume() throws Exception { diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageAbstractTerminalConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageAbstractTerminalConsumer.java index 3664bca..2c1c40b 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageAbstractTerminalConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageAbstractTerminalConsumer.java @@ -4,17 +4,13 @@ Generated with Xtext package org.eclipse.xtext.parser.packrat.consumers; import org.eclipse.emf.ecore.EObject; -import org.eclipse.xtext.parser.packrat.ICharSequenceWithOffset; -import org.eclipse.xtext.parser.packrat.IHiddenTokenHandler; -import org.eclipse.xtext.parser.packrat.IMarkerFactory; 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.consumers.INonTerminalConsumerConfiguration; import org.eclipse.xtext.parser.packrat.consumers.ConsumeResult; 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.services.XtextGrammarTestLanguageGrammarAccess; import org.eclipse.xtext.services.XtextGrammarTestLanguageGrammarAccess.AbstractTerminalElements; @@ -32,10 +28,8 @@ public final class XtextGrammarTestLanguageAbstractTerminalConsumer extends NonT private XtextGrammarTestLanguageParenthesizedElementConsumer parenthesizedElementConsumer; private XtextGrammarTestLanguageRuleCallConsumer ruleCallConsumer; - public XtextGrammarTestLanguageAbstractTerminalConsumer(ICharSequenceWithOffset input, IMarkerFactory markerFactory, - IParsedTokenAcceptor tokenAcceptor, IHiddenTokenHandler hiddenTokenHandler, IConsumerUtility consumerUtil, - ITerminalConsumer[] hiddenTokens) { - super(input, markerFactory, tokenAcceptor, hiddenTokenHandler, consumerUtil, hiddenTokens); + public XtextGrammarTestLanguageAbstractTerminalConsumer(INonTerminalConsumerConfiguration configuration, ITerminalConsumer[] hiddenTokens) { + super(configuration, hiddenTokens); } protected int doConsume() throws Exception { diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageAbstractTokenConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageAbstractTokenConsumer.java index 91c52ad..58082a7 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageAbstractTokenConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageAbstractTokenConsumer.java @@ -4,17 +4,13 @@ Generated with Xtext package org.eclipse.xtext.parser.packrat.consumers; import org.eclipse.emf.ecore.EObject; -import org.eclipse.xtext.parser.packrat.ICharSequenceWithOffset; -import org.eclipse.xtext.parser.packrat.IHiddenTokenHandler; -import org.eclipse.xtext.parser.packrat.IMarkerFactory; 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.consumers.INonTerminalConsumerConfiguration; import org.eclipse.xtext.parser.packrat.consumers.ConsumeResult; 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.services.XtextGrammarTestLanguageGrammarAccess; import org.eclipse.xtext.services.XtextGrammarTestLanguageGrammarAccess.AbstractTokenElements; @@ -36,10 +32,8 @@ public final class XtextGrammarTestLanguageAbstractTokenConsumer extends NonTerm private ICharacterClass keyword$12$Delimiter; - public XtextGrammarTestLanguageAbstractTokenConsumer(ICharSequenceWithOffset input, IMarkerFactory markerFactory, - IParsedTokenAcceptor tokenAcceptor, IHiddenTokenHandler hiddenTokenHandler, IConsumerUtility consumerUtil, - ITerminalConsumer[] hiddenTokens) { - super(input, markerFactory, tokenAcceptor, hiddenTokenHandler, consumerUtil, hiddenTokens); + public XtextGrammarTestLanguageAbstractTokenConsumer(INonTerminalConsumerConfiguration configuration, ITerminalConsumer[] hiddenTokens) { + super(configuration, hiddenTokens); keyword$10$Delimiter = ICharacterClass.Factory.nullClass(); keyword$11$Delimiter = ICharacterClass.Factory.nullClass(); keyword$12$Delimiter = ICharacterClass.Factory.nullClass(); diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageActionConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageActionConsumer.java index 2851af0..c4a5efd 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageActionConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageActionConsumer.java @@ -4,17 +4,13 @@ Generated with Xtext package org.eclipse.xtext.parser.packrat.consumers; import org.eclipse.emf.ecore.EObject; -import org.eclipse.xtext.parser.packrat.ICharSequenceWithOffset; -import org.eclipse.xtext.parser.packrat.IHiddenTokenHandler; -import org.eclipse.xtext.parser.packrat.IMarkerFactory; 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.consumers.INonTerminalConsumerConfiguration; import org.eclipse.xtext.parser.packrat.consumers.ConsumeResult; 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.services.XtextGrammarTestLanguageGrammarAccess; import org.eclipse.xtext.services.XtextGrammarTestLanguageGrammarAccess.ActionElements; @@ -46,10 +42,8 @@ public final class XtextGrammarTestLanguageActionConsumer extends NonTerminalCon private ISequenceMatcher ruleCall$16$Delimiter; - public XtextGrammarTestLanguageActionConsumer(ICharSequenceWithOffset input, IMarkerFactory markerFactory, - IParsedTokenAcceptor tokenAcceptor, IHiddenTokenHandler hiddenTokenHandler, IConsumerUtility consumerUtil, - ITerminalConsumer[] hiddenTokens) { - super(input, markerFactory, tokenAcceptor, hiddenTokenHandler, consumerUtil, hiddenTokens); + public XtextGrammarTestLanguageActionConsumer(INonTerminalConsumerConfiguration configuration, ITerminalConsumer[] hiddenTokens) { + super(configuration, hiddenTokens); keyword$8$Delimiter = ICharacterClass.Factory.nullClass(); keyword$10$Delimiter = ICharacterClass.Factory.nullClass(); keyword$11$Delimiter = ICharacterClass.Factory.nullClass(); diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageAlternativesConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageAlternativesConsumer.java index 9a7db29..df945b3 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageAlternativesConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageAlternativesConsumer.java @@ -4,17 +4,13 @@ Generated with Xtext package org.eclipse.xtext.parser.packrat.consumers; import org.eclipse.emf.ecore.EObject; -import org.eclipse.xtext.parser.packrat.ICharSequenceWithOffset; -import org.eclipse.xtext.parser.packrat.IHiddenTokenHandler; -import org.eclipse.xtext.parser.packrat.IMarkerFactory; 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.consumers.INonTerminalConsumerConfiguration; import org.eclipse.xtext.parser.packrat.consumers.ConsumeResult; 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.services.XtextGrammarTestLanguageGrammarAccess; import org.eclipse.xtext.services.XtextGrammarTestLanguageGrammarAccess.AlternativesElements; @@ -28,10 +24,8 @@ public final class XtextGrammarTestLanguageAlternativesConsumer extends NonTermi private ICharacterClass keyword$7$Delimiter; - public XtextGrammarTestLanguageAlternativesConsumer(ICharSequenceWithOffset input, IMarkerFactory markerFactory, - IParsedTokenAcceptor tokenAcceptor, IHiddenTokenHandler hiddenTokenHandler, IConsumerUtility consumerUtil, - ITerminalConsumer[] hiddenTokens) { - super(input, markerFactory, tokenAcceptor, hiddenTokenHandler, consumerUtil, hiddenTokens); + public XtextGrammarTestLanguageAlternativesConsumer(INonTerminalConsumerConfiguration configuration, ITerminalConsumer[] hiddenTokens) { + super(configuration, hiddenTokens); keyword$7$Delimiter = ICharacterClass.Factory.nullClass(); } diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageAssignmentConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageAssignmentConsumer.java index 80457b3..a521331 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageAssignmentConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageAssignmentConsumer.java @@ -4,17 +4,13 @@ Generated with Xtext package org.eclipse.xtext.parser.packrat.consumers; import org.eclipse.emf.ecore.EObject; -import org.eclipse.xtext.parser.packrat.ICharSequenceWithOffset; -import org.eclipse.xtext.parser.packrat.IHiddenTokenHandler; -import org.eclipse.xtext.parser.packrat.IMarkerFactory; 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.consumers.INonTerminalConsumerConfiguration; import org.eclipse.xtext.parser.packrat.consumers.ConsumeResult; 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.services.XtextGrammarTestLanguageGrammarAccess; import org.eclipse.xtext.services.XtextGrammarTestLanguageGrammarAccess.AssignmentElements; @@ -36,10 +32,8 @@ public final class XtextGrammarTestLanguageAssignmentConsumer extends NonTermina private ISequenceMatcher ruleCall$4$Delimiter; - public XtextGrammarTestLanguageAssignmentConsumer(ICharSequenceWithOffset input, IMarkerFactory markerFactory, - IParsedTokenAcceptor tokenAcceptor, IHiddenTokenHandler hiddenTokenHandler, IConsumerUtility consumerUtil, - ITerminalConsumer[] hiddenTokens) { - super(input, markerFactory, tokenAcceptor, hiddenTokenHandler, consumerUtil, hiddenTokens); + public XtextGrammarTestLanguageAssignmentConsumer(INonTerminalConsumerConfiguration configuration, ITerminalConsumer[] hiddenTokens) { + super(configuration, hiddenTokens); keyword$8$Delimiter = ICharacterClass.Factory.nullClass(); keyword$9$Delimiter = ICharacterClass.Factory.nullClass(); keyword$10$Delimiter = ICharacterClass.Factory.nullClass(); diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageCharacterRangeConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageCharacterRangeConsumer.java index 7b65a24..55dc653 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageCharacterRangeConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageCharacterRangeConsumer.java @@ -4,17 +4,13 @@ Generated with Xtext package org.eclipse.xtext.parser.packrat.consumers; import org.eclipse.emf.ecore.EObject; -import org.eclipse.xtext.parser.packrat.ICharSequenceWithOffset; -import org.eclipse.xtext.parser.packrat.IHiddenTokenHandler; -import org.eclipse.xtext.parser.packrat.IMarkerFactory; 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.consumers.INonTerminalConsumerConfiguration; import org.eclipse.xtext.parser.packrat.consumers.ConsumeResult; 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.services.XtextGrammarTestLanguageGrammarAccess; import org.eclipse.xtext.services.XtextGrammarTestLanguageGrammarAccess.CharacterRangeElements; @@ -28,10 +24,8 @@ public final class XtextGrammarTestLanguageCharacterRangeConsumer extends NonTer private ICharacterClass keyword$7$Delimiter; - public XtextGrammarTestLanguageCharacterRangeConsumer(ICharSequenceWithOffset input, IMarkerFactory markerFactory, - IParsedTokenAcceptor tokenAcceptor, IHiddenTokenHandler hiddenTokenHandler, IConsumerUtility consumerUtil, - ITerminalConsumer[] hiddenTokens) { - super(input, markerFactory, tokenAcceptor, hiddenTokenHandler, consumerUtil, hiddenTokens); + public XtextGrammarTestLanguageCharacterRangeConsumer(INonTerminalConsumerConfiguration configuration, ITerminalConsumer[] hiddenTokens) { + super(configuration, hiddenTokens); keyword$7$Delimiter = ICharacterClass.Factory.nullClass(); } diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageCrossReferenceConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageCrossReferenceConsumer.java index 876dc92..85e8a00 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageCrossReferenceConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageCrossReferenceConsumer.java @@ -4,17 +4,13 @@ Generated with Xtext package org.eclipse.xtext.parser.packrat.consumers; import org.eclipse.emf.ecore.EObject; -import org.eclipse.xtext.parser.packrat.ICharSequenceWithOffset; -import org.eclipse.xtext.parser.packrat.IHiddenTokenHandler; -import org.eclipse.xtext.parser.packrat.IMarkerFactory; 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.consumers.INonTerminalConsumerConfiguration; import org.eclipse.xtext.parser.packrat.consumers.ConsumeResult; 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.services.XtextGrammarTestLanguageGrammarAccess; import org.eclipse.xtext.services.XtextGrammarTestLanguageGrammarAccess.CrossReferenceElements; @@ -36,10 +32,8 @@ public final class XtextGrammarTestLanguageCrossReferenceConsumer extends NonTer private ICharacterClass keyword$12$Delimiter; - public XtextGrammarTestLanguageCrossReferenceConsumer(ICharSequenceWithOffset input, IMarkerFactory markerFactory, - IParsedTokenAcceptor tokenAcceptor, IHiddenTokenHandler hiddenTokenHandler, IConsumerUtility consumerUtil, - ITerminalConsumer[] hiddenTokens) { - super(input, markerFactory, tokenAcceptor, hiddenTokenHandler, consumerUtil, hiddenTokens); + public XtextGrammarTestLanguageCrossReferenceConsumer(INonTerminalConsumerConfiguration configuration, ITerminalConsumer[] hiddenTokens) { + super(configuration, hiddenTokens); crossReference$10$Delimiter = ISequenceMatcher.Factory.nullMatcher(); keyword$4$Delimiter = ICharacterClass.Factory.nullClass(); keyword$8$Delimiter = ICharacterClass.Factory.nullClass(); diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageGeneratedMetamodelConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageGeneratedMetamodelConsumer.java index 9c52465..bef9ba2 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageGeneratedMetamodelConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageGeneratedMetamodelConsumer.java @@ -4,17 +4,13 @@ Generated with Xtext package org.eclipse.xtext.parser.packrat.consumers; import org.eclipse.emf.ecore.EObject; -import org.eclipse.xtext.parser.packrat.ICharSequenceWithOffset; -import org.eclipse.xtext.parser.packrat.IHiddenTokenHandler; -import org.eclipse.xtext.parser.packrat.IMarkerFactory; 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.consumers.INonTerminalConsumerConfiguration; import org.eclipse.xtext.parser.packrat.consumers.ConsumeResult; 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.services.XtextGrammarTestLanguageGrammarAccess; import org.eclipse.xtext.services.XtextGrammarTestLanguageGrammarAccess.GeneratedMetamodelElements; @@ -38,10 +34,8 @@ public final class XtextGrammarTestLanguageGeneratedMetamodelConsumer extends No private ISequenceMatcher ruleCall$13$Delimiter; - public XtextGrammarTestLanguageGeneratedMetamodelConsumer(ICharSequenceWithOffset input, IMarkerFactory markerFactory, - IParsedTokenAcceptor tokenAcceptor, IHiddenTokenHandler hiddenTokenHandler, IConsumerUtility consumerUtil, - ITerminalConsumer[] hiddenTokens) { - super(input, markerFactory, tokenAcceptor, hiddenTokenHandler, consumerUtil, hiddenTokens); + public XtextGrammarTestLanguageGeneratedMetamodelConsumer(INonTerminalConsumerConfiguration configuration, ITerminalConsumer[] hiddenTokens) { + super(configuration, hiddenTokens); crossReference$8$Delimiter = ISequenceMatcher.Factory.nullMatcher(); keyword$4$Delimiter = ICharacterClass.Factory.nullClass(); keyword$11$Delimiter = ICharacterClass.Factory.nullClass(); diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageGrammarConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageGrammarConsumer.java index 547e8f9..33c9bea 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageGrammarConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageGrammarConsumer.java @@ -4,17 +4,13 @@ Generated with Xtext package org.eclipse.xtext.parser.packrat.consumers; import org.eclipse.emf.ecore.EObject; -import org.eclipse.xtext.parser.packrat.ICharSequenceWithOffset; -import org.eclipse.xtext.parser.packrat.IHiddenTokenHandler; -import org.eclipse.xtext.parser.packrat.IMarkerFactory; 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.consumers.INonTerminalConsumerConfiguration; import org.eclipse.xtext.parser.packrat.consumers.ConsumeResult; 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.services.XtextGrammarTestLanguageGrammarAccess; import org.eclipse.xtext.services.XtextGrammarTestLanguageGrammarAccess.GrammarElements; @@ -48,10 +44,8 @@ public final class XtextGrammarTestLanguageGrammarConsumer extends NonTerminalCo private ISequenceMatcher ruleCall$24$Delimiter; - public XtextGrammarTestLanguageGrammarConsumer(ICharSequenceWithOffset input, IMarkerFactory markerFactory, - IParsedTokenAcceptor tokenAcceptor, IHiddenTokenHandler hiddenTokenHandler, IConsumerUtility consumerUtil, - ITerminalConsumer[] hiddenTokens) { - super(input, markerFactory, tokenAcceptor, hiddenTokenHandler, consumerUtil, hiddenTokens); + public XtextGrammarTestLanguageGrammarConsumer(INonTerminalConsumerConfiguration configuration, ITerminalConsumer[] hiddenTokens) { + super(configuration, hiddenTokens); keyword$8$Delimiter = ICharacterClass.Factory.nullClass(); keyword$9$Delimiter = ICharacterClass.Factory.nullClass(); keyword$13$Delimiter = ICharacterClass.Factory.nullClass(); diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageGroupConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageGroupConsumer.java index 7b6d190..ee26201 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageGroupConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageGroupConsumer.java @@ -4,17 +4,13 @@ Generated with Xtext package org.eclipse.xtext.parser.packrat.consumers; import org.eclipse.emf.ecore.EObject; -import org.eclipse.xtext.parser.packrat.ICharSequenceWithOffset; -import org.eclipse.xtext.parser.packrat.IHiddenTokenHandler; -import org.eclipse.xtext.parser.packrat.IMarkerFactory; 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.consumers.INonTerminalConsumerConfiguration; import org.eclipse.xtext.parser.packrat.consumers.ConsumeResult; 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.services.XtextGrammarTestLanguageGrammarAccess; import org.eclipse.xtext.services.XtextGrammarTestLanguageGrammarAccess.GroupElements; @@ -26,10 +22,8 @@ public final class XtextGrammarTestLanguageGroupConsumer extends NonTerminalCons private XtextGrammarTestLanguageAbstractTokenConsumer abstractTokenConsumer; - public XtextGrammarTestLanguageGroupConsumer(ICharSequenceWithOffset input, IMarkerFactory markerFactory, - IParsedTokenAcceptor tokenAcceptor, IHiddenTokenHandler hiddenTokenHandler, IConsumerUtility consumerUtil, - ITerminalConsumer[] hiddenTokens) { - super(input, markerFactory, tokenAcceptor, hiddenTokenHandler, consumerUtil, hiddenTokens); + public XtextGrammarTestLanguageGroupConsumer(INonTerminalConsumerConfiguration configuration, ITerminalConsumer[] hiddenTokens) { + super(configuration, hiddenTokens); } protected int doConsume() throws Exception { diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageKeywordConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageKeywordConsumer.java index 0146cdb..5171f9a 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageKeywordConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageKeywordConsumer.java @@ -4,17 +4,13 @@ Generated with Xtext package org.eclipse.xtext.parser.packrat.consumers; import org.eclipse.emf.ecore.EObject; -import org.eclipse.xtext.parser.packrat.ICharSequenceWithOffset; -import org.eclipse.xtext.parser.packrat.IHiddenTokenHandler; -import org.eclipse.xtext.parser.packrat.IMarkerFactory; 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.consumers.INonTerminalConsumerConfiguration; import org.eclipse.xtext.parser.packrat.consumers.ConsumeResult; 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.services.XtextGrammarTestLanguageGrammarAccess; import org.eclipse.xtext.services.XtextGrammarTestLanguageGrammarAccess.KeywordElements; @@ -28,10 +24,8 @@ public final class XtextGrammarTestLanguageKeywordConsumer extends NonTerminalCo private ISequenceMatcher ruleCall$2$Delimiter; - public XtextGrammarTestLanguageKeywordConsumer(ICharSequenceWithOffset input, IMarkerFactory markerFactory, - IParsedTokenAcceptor tokenAcceptor, IHiddenTokenHandler hiddenTokenHandler, IConsumerUtility consumerUtil, - ITerminalConsumer[] hiddenTokens) { - super(input, markerFactory, tokenAcceptor, hiddenTokenHandler, consumerUtil, hiddenTokens); + public XtextGrammarTestLanguageKeywordConsumer(INonTerminalConsumerConfiguration configuration, ITerminalConsumer[] hiddenTokens) { + super(configuration, hiddenTokens); ruleCall$2$Delimiter = ISequenceMatcher.Factory.nullMatcher(); } diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageLexerRuleConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageLexerRuleConsumer.java index a78f6eb..71bf560 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageLexerRuleConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageLexerRuleConsumer.java @@ -4,17 +4,13 @@ Generated with Xtext package org.eclipse.xtext.parser.packrat.consumers; import org.eclipse.emf.ecore.EObject; -import org.eclipse.xtext.parser.packrat.ICharSequenceWithOffset; -import org.eclipse.xtext.parser.packrat.IHiddenTokenHandler; -import org.eclipse.xtext.parser.packrat.IMarkerFactory; 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.consumers.INonTerminalConsumerConfiguration; import org.eclipse.xtext.parser.packrat.consumers.ConsumeResult; 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.services.XtextGrammarTestLanguageGrammarAccess; import org.eclipse.xtext.services.XtextGrammarTestLanguageGrammarAccess.LexerRuleElements; @@ -44,10 +40,8 @@ public final class XtextGrammarTestLanguageLexerRuleConsumer extends NonTerminal private ISequenceMatcher ruleCall$17$Delimiter; - public XtextGrammarTestLanguageLexerRuleConsumer(ICharSequenceWithOffset input, IMarkerFactory markerFactory, - IParsedTokenAcceptor tokenAcceptor, IHiddenTokenHandler hiddenTokenHandler, IConsumerUtility consumerUtil, - ITerminalConsumer[] hiddenTokens) { - super(input, markerFactory, tokenAcceptor, hiddenTokenHandler, consumerUtil, hiddenTokens); + public XtextGrammarTestLanguageLexerRuleConsumer(INonTerminalConsumerConfiguration configuration, ITerminalConsumer[] hiddenTokens) { + super(configuration, hiddenTokens); keyword$7$Delimiter = ICharacterClass.Factory.nullClass(); keyword$8$Delimiter = ICharacterClass.Factory.nullClass(); keyword$12$Delimiter = ICharacterClass.Factory.nullClass(); diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageNegatedTokenConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageNegatedTokenConsumer.java index c797bce..6656a13 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageNegatedTokenConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageNegatedTokenConsumer.java @@ -4,17 +4,13 @@ Generated with Xtext package org.eclipse.xtext.parser.packrat.consumers; import org.eclipse.emf.ecore.EObject; -import org.eclipse.xtext.parser.packrat.ICharSequenceWithOffset; -import org.eclipse.xtext.parser.packrat.IHiddenTokenHandler; -import org.eclipse.xtext.parser.packrat.IMarkerFactory; 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.consumers.INonTerminalConsumerConfiguration; import org.eclipse.xtext.parser.packrat.consumers.ConsumeResult; 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.services.XtextGrammarTestLanguageGrammarAccess; import org.eclipse.xtext.services.XtextGrammarTestLanguageGrammarAccess.NegatedTokenElements; @@ -28,10 +24,8 @@ public final class XtextGrammarTestLanguageNegatedTokenConsumer extends NonTermi private ICharacterClass keyword$2$Delimiter; - public XtextGrammarTestLanguageNegatedTokenConsumer(ICharSequenceWithOffset input, IMarkerFactory markerFactory, - IParsedTokenAcceptor tokenAcceptor, IHiddenTokenHandler hiddenTokenHandler, IConsumerUtility consumerUtil, - ITerminalConsumer[] hiddenTokens) { - super(input, markerFactory, tokenAcceptor, hiddenTokenHandler, consumerUtil, hiddenTokens); + public XtextGrammarTestLanguageNegatedTokenConsumer(INonTerminalConsumerConfiguration configuration, ITerminalConsumer[] hiddenTokens) { + super(configuration, hiddenTokens); keyword$2$Delimiter = ICharacterClass.Factory.nullClass(); } diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageParenthesizedElementConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageParenthesizedElementConsumer.java index 67ef7b1..9e25341 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageParenthesizedElementConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageParenthesizedElementConsumer.java @@ -4,17 +4,13 @@ Generated with Xtext package org.eclipse.xtext.parser.packrat.consumers; import org.eclipse.emf.ecore.EObject; -import org.eclipse.xtext.parser.packrat.ICharSequenceWithOffset; -import org.eclipse.xtext.parser.packrat.IHiddenTokenHandler; -import org.eclipse.xtext.parser.packrat.IMarkerFactory; 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.consumers.INonTerminalConsumerConfiguration; import org.eclipse.xtext.parser.packrat.consumers.ConsumeResult; 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.services.XtextGrammarTestLanguageGrammarAccess; import org.eclipse.xtext.services.XtextGrammarTestLanguageGrammarAccess.ParenthesizedElementElements; @@ -30,10 +26,8 @@ public final class XtextGrammarTestLanguageParenthesizedElementConsumer extends private ICharacterClass keyword$5$Delimiter; - public XtextGrammarTestLanguageParenthesizedElementConsumer(ICharSequenceWithOffset input, IMarkerFactory markerFactory, - IParsedTokenAcceptor tokenAcceptor, IHiddenTokenHandler hiddenTokenHandler, IConsumerUtility consumerUtil, - ITerminalConsumer[] hiddenTokens) { - super(input, markerFactory, tokenAcceptor, hiddenTokenHandler, consumerUtil, hiddenTokens); + public XtextGrammarTestLanguageParenthesizedElementConsumer(INonTerminalConsumerConfiguration configuration, ITerminalConsumer[] hiddenTokens) { + super(configuration, hiddenTokens); keyword$3$Delimiter = ICharacterClass.Factory.nullClass(); keyword$5$Delimiter = ICharacterClass.Factory.nullClass(); } diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageParenthesizedTerminalElementConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageParenthesizedTerminalElementConsumer.java index 2289862..71c0b11 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageParenthesizedTerminalElementConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageParenthesizedTerminalElementConsumer.java @@ -4,17 +4,13 @@ Generated with Xtext package org.eclipse.xtext.parser.packrat.consumers; import org.eclipse.emf.ecore.EObject; -import org.eclipse.xtext.parser.packrat.ICharSequenceWithOffset; -import org.eclipse.xtext.parser.packrat.IHiddenTokenHandler; -import org.eclipse.xtext.parser.packrat.IMarkerFactory; 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.consumers.INonTerminalConsumerConfiguration; import org.eclipse.xtext.parser.packrat.consumers.ConsumeResult; 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.services.XtextGrammarTestLanguageGrammarAccess; import org.eclipse.xtext.services.XtextGrammarTestLanguageGrammarAccess.ParenthesizedTerminalElementElements; @@ -30,10 +26,8 @@ public final class XtextGrammarTestLanguageParenthesizedTerminalElementConsumer private ICharacterClass keyword$5$Delimiter; - public XtextGrammarTestLanguageParenthesizedTerminalElementConsumer(ICharSequenceWithOffset input, IMarkerFactory markerFactory, - IParsedTokenAcceptor tokenAcceptor, IHiddenTokenHandler hiddenTokenHandler, IConsumerUtility consumerUtil, - ITerminalConsumer[] hiddenTokens) { - super(input, markerFactory, tokenAcceptor, hiddenTokenHandler, consumerUtil, hiddenTokens); + public XtextGrammarTestLanguageParenthesizedTerminalElementConsumer(INonTerminalConsumerConfiguration configuration, ITerminalConsumer[] hiddenTokens) { + super(configuration, hiddenTokens); keyword$3$Delimiter = ICharacterClass.Factory.nullClass(); keyword$5$Delimiter = ICharacterClass.Factory.nullClass(); } diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageParserRuleConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageParserRuleConsumer.java index 8272e4f..b76382e 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageParserRuleConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageParserRuleConsumer.java @@ -4,17 +4,13 @@ Generated with Xtext package org.eclipse.xtext.parser.packrat.consumers; import org.eclipse.emf.ecore.EObject; -import org.eclipse.xtext.parser.packrat.ICharSequenceWithOffset; -import org.eclipse.xtext.parser.packrat.IHiddenTokenHandler; -import org.eclipse.xtext.parser.packrat.IMarkerFactory; 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.consumers.INonTerminalConsumerConfiguration; import org.eclipse.xtext.parser.packrat.consumers.ConsumeResult; 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.services.XtextGrammarTestLanguageGrammarAccess; import org.eclipse.xtext.services.XtextGrammarTestLanguageGrammarAccess.ParserRuleElements; @@ -50,10 +46,8 @@ public final class XtextGrammarTestLanguageParserRuleConsumer extends NonTermina private ISequenceMatcher ruleCall$7$Delimiter; - public XtextGrammarTestLanguageParserRuleConsumer(ICharSequenceWithOffset input, IMarkerFactory markerFactory, - IParsedTokenAcceptor tokenAcceptor, IHiddenTokenHandler hiddenTokenHandler, IConsumerUtility consumerUtil, - ITerminalConsumer[] hiddenTokens) { - super(input, markerFactory, tokenAcceptor, hiddenTokenHandler, consumerUtil, hiddenTokens); + public XtextGrammarTestLanguageParserRuleConsumer(INonTerminalConsumerConfiguration configuration, ITerminalConsumer[] hiddenTokens) { + super(configuration, hiddenTokens); crossReference$20$Delimiter = ISequenceMatcher.Factory.nullMatcher(); crossReference$25$Delimiter = ISequenceMatcher.Factory.nullMatcher(); keyword$9$Delimiter = ICharacterClass.Factory.nullClass(); diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageReferencedMetamodelConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageReferencedMetamodelConsumer.java index bd7e4e6..7aa095b 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageReferencedMetamodelConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageReferencedMetamodelConsumer.java @@ -4,17 +4,13 @@ Generated with Xtext package org.eclipse.xtext.parser.packrat.consumers; import org.eclipse.emf.ecore.EObject; -import org.eclipse.xtext.parser.packrat.ICharSequenceWithOffset; -import org.eclipse.xtext.parser.packrat.IHiddenTokenHandler; -import org.eclipse.xtext.parser.packrat.IMarkerFactory; 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.consumers.INonTerminalConsumerConfiguration; import org.eclipse.xtext.parser.packrat.consumers.ConsumeResult; 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.services.XtextGrammarTestLanguageGrammarAccess; import org.eclipse.xtext.services.XtextGrammarTestLanguageGrammarAccess.ReferencedMetamodelElements; @@ -36,10 +32,8 @@ public final class XtextGrammarTestLanguageReferencedMetamodelConsumer extends N private ISequenceMatcher ruleCall$10$Delimiter; - public XtextGrammarTestLanguageReferencedMetamodelConsumer(ICharSequenceWithOffset input, IMarkerFactory markerFactory, - IParsedTokenAcceptor tokenAcceptor, IHiddenTokenHandler hiddenTokenHandler, IConsumerUtility consumerUtil, - ITerminalConsumer[] hiddenTokens) { - super(input, markerFactory, tokenAcceptor, hiddenTokenHandler, consumerUtil, hiddenTokens); + public XtextGrammarTestLanguageReferencedMetamodelConsumer(INonTerminalConsumerConfiguration configuration, ITerminalConsumer[] hiddenTokens) { + super(configuration, hiddenTokens); crossReference$5$Delimiter = ISequenceMatcher.Factory.nullMatcher(); keyword$3$Delimiter = ICharacterClass.Factory.nullClass(); keyword$8$Delimiter = ICharacterClass.Factory.nullClass(); diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageRuleCallConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageRuleCallConsumer.java index edd5d12..63a010e 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageRuleCallConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageRuleCallConsumer.java @@ -4,17 +4,13 @@ Generated with Xtext package org.eclipse.xtext.parser.packrat.consumers; import org.eclipse.emf.ecore.EObject; -import org.eclipse.xtext.parser.packrat.ICharSequenceWithOffset; -import org.eclipse.xtext.parser.packrat.IHiddenTokenHandler; -import org.eclipse.xtext.parser.packrat.IMarkerFactory; 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.consumers.INonTerminalConsumerConfiguration; import org.eclipse.xtext.parser.packrat.consumers.ConsumeResult; 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.services.XtextGrammarTestLanguageGrammarAccess; import org.eclipse.xtext.services.XtextGrammarTestLanguageGrammarAccess.RuleCallElements; @@ -28,10 +24,8 @@ public final class XtextGrammarTestLanguageRuleCallConsumer extends NonTerminalC private ISequenceMatcher crossReference$2$Delimiter; - public XtextGrammarTestLanguageRuleCallConsumer(ICharSequenceWithOffset input, IMarkerFactory markerFactory, - IParsedTokenAcceptor tokenAcceptor, IHiddenTokenHandler hiddenTokenHandler, IConsumerUtility consumerUtil, - ITerminalConsumer[] hiddenTokens) { - super(input, markerFactory, tokenAcceptor, hiddenTokenHandler, consumerUtil, hiddenTokens); + public XtextGrammarTestLanguageRuleCallConsumer(INonTerminalConsumerConfiguration configuration, ITerminalConsumer[] hiddenTokens) { + super(configuration, hiddenTokens); crossReference$2$Delimiter = ISequenceMatcher.Factory.nullMatcher(); } diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageTerminalAlternativesConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageTerminalAlternativesConsumer.java index cb24d60..593f39c 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageTerminalAlternativesConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageTerminalAlternativesConsumer.java @@ -4,17 +4,13 @@ Generated with Xtext package org.eclipse.xtext.parser.packrat.consumers; import org.eclipse.emf.ecore.EObject; -import org.eclipse.xtext.parser.packrat.ICharSequenceWithOffset; -import org.eclipse.xtext.parser.packrat.IHiddenTokenHandler; -import org.eclipse.xtext.parser.packrat.IMarkerFactory; 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.consumers.INonTerminalConsumerConfiguration; import org.eclipse.xtext.parser.packrat.consumers.ConsumeResult; 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.services.XtextGrammarTestLanguageGrammarAccess; import org.eclipse.xtext.services.XtextGrammarTestLanguageGrammarAccess.TerminalAlternativesElements; @@ -28,10 +24,8 @@ public final class XtextGrammarTestLanguageTerminalAlternativesConsumer extends private ICharacterClass keyword$7$Delimiter; - public XtextGrammarTestLanguageTerminalAlternativesConsumer(ICharSequenceWithOffset input, IMarkerFactory markerFactory, - IParsedTokenAcceptor tokenAcceptor, IHiddenTokenHandler hiddenTokenHandler, IConsumerUtility consumerUtil, - ITerminalConsumer[] hiddenTokens) { - super(input, markerFactory, tokenAcceptor, hiddenTokenHandler, consumerUtil, hiddenTokens); + public XtextGrammarTestLanguageTerminalAlternativesConsumer(INonTerminalConsumerConfiguration configuration, ITerminalConsumer[] hiddenTokens) { + super(configuration, hiddenTokens); keyword$7$Delimiter = ICharacterClass.Factory.nullClass(); } diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageTerminalGroupConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageTerminalGroupConsumer.java index d73509a..897b684 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageTerminalGroupConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageTerminalGroupConsumer.java @@ -4,17 +4,13 @@ Generated with Xtext package org.eclipse.xtext.parser.packrat.consumers; import org.eclipse.emf.ecore.EObject; -import org.eclipse.xtext.parser.packrat.ICharSequenceWithOffset; -import org.eclipse.xtext.parser.packrat.IHiddenTokenHandler; -import org.eclipse.xtext.parser.packrat.IMarkerFactory; 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.consumers.INonTerminalConsumerConfiguration; import org.eclipse.xtext.parser.packrat.consumers.ConsumeResult; 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.services.XtextGrammarTestLanguageGrammarAccess; import org.eclipse.xtext.services.XtextGrammarTestLanguageGrammarAccess.TerminalGroupElements; @@ -26,10 +22,8 @@ public final class XtextGrammarTestLanguageTerminalGroupConsumer extends NonTerm private XtextGrammarTestLanguageTerminalTokenConsumer terminalTokenConsumer; - public XtextGrammarTestLanguageTerminalGroupConsumer(ICharSequenceWithOffset input, IMarkerFactory markerFactory, - IParsedTokenAcceptor tokenAcceptor, IHiddenTokenHandler hiddenTokenHandler, IConsumerUtility consumerUtil, - ITerminalConsumer[] hiddenTokens) { - super(input, markerFactory, tokenAcceptor, hiddenTokenHandler, consumerUtil, hiddenTokens); + public XtextGrammarTestLanguageTerminalGroupConsumer(INonTerminalConsumerConfiguration configuration, ITerminalConsumer[] hiddenTokens) { + super(configuration, hiddenTokens); } protected int doConsume() throws Exception { diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageTerminalRuleConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageTerminalRuleConsumer.java index e91f2b4..a47d152 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageTerminalRuleConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageTerminalRuleConsumer.java @@ -4,17 +4,13 @@ Generated with Xtext package org.eclipse.xtext.parser.packrat.consumers; import org.eclipse.emf.ecore.EObject; -import org.eclipse.xtext.parser.packrat.ICharSequenceWithOffset; -import org.eclipse.xtext.parser.packrat.IHiddenTokenHandler; -import org.eclipse.xtext.parser.packrat.IMarkerFactory; 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.consumers.INonTerminalConsumerConfiguration; import org.eclipse.xtext.parser.packrat.consumers.ConsumeResult; 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.services.XtextGrammarTestLanguageGrammarAccess; import org.eclipse.xtext.services.XtextGrammarTestLanguageGrammarAccess.TerminalRuleElements; @@ -40,10 +36,8 @@ public final class XtextGrammarTestLanguageTerminalRuleConsumer extends NonTermi private ISequenceMatcher ruleCall$9$Delimiter; - public XtextGrammarTestLanguageTerminalRuleConsumer(ICharSequenceWithOffset input, IMarkerFactory markerFactory, - IParsedTokenAcceptor tokenAcceptor, IHiddenTokenHandler hiddenTokenHandler, IConsumerUtility consumerUtil, - ITerminalConsumer[] hiddenTokens) { - super(input, markerFactory, tokenAcceptor, hiddenTokenHandler, consumerUtil, hiddenTokens); + public XtextGrammarTestLanguageTerminalRuleConsumer(INonTerminalConsumerConfiguration configuration, ITerminalConsumer[] hiddenTokens) { + super(configuration, hiddenTokens); keyword$7$Delimiter = ICharacterClass.Factory.nullClass(); keyword$11$Delimiter = ICharacterClass.Factory.nullClass(); keyword$14$Delimiter = ICharacterClass.Factory.nullClass(); diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageTerminalTokenConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageTerminalTokenConsumer.java index ef67c0a..72a4f25 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageTerminalTokenConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageTerminalTokenConsumer.java @@ -4,17 +4,13 @@ Generated with Xtext package org.eclipse.xtext.parser.packrat.consumers; import org.eclipse.emf.ecore.EObject; -import org.eclipse.xtext.parser.packrat.ICharSequenceWithOffset; -import org.eclipse.xtext.parser.packrat.IHiddenTokenHandler; -import org.eclipse.xtext.parser.packrat.IMarkerFactory; 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.consumers.INonTerminalConsumerConfiguration; import org.eclipse.xtext.parser.packrat.consumers.ConsumeResult; 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.services.XtextGrammarTestLanguageGrammarAccess; import org.eclipse.xtext.services.XtextGrammarTestLanguageGrammarAccess.TerminalTokenElements; @@ -32,10 +28,8 @@ public final class XtextGrammarTestLanguageTerminalTokenConsumer extends NonTerm private ICharacterClass keyword$8$Delimiter; - public XtextGrammarTestLanguageTerminalTokenConsumer(ICharSequenceWithOffset input, IMarkerFactory markerFactory, - IParsedTokenAcceptor tokenAcceptor, IHiddenTokenHandler hiddenTokenHandler, IConsumerUtility consumerUtil, - ITerminalConsumer[] hiddenTokens) { - super(input, markerFactory, tokenAcceptor, hiddenTokenHandler, consumerUtil, hiddenTokens); + public XtextGrammarTestLanguageTerminalTokenConsumer(INonTerminalConsumerConfiguration configuration, ITerminalConsumer[] hiddenTokens) { + super(configuration, hiddenTokens); keyword$6$Delimiter = ICharacterClass.Factory.nullClass(); keyword$7$Delimiter = ICharacterClass.Factory.nullClass(); keyword$8$Delimiter = ICharacterClass.Factory.nullClass(); diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageTerminalTokenElementConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageTerminalTokenElementConsumer.java index e62938d..019c424 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageTerminalTokenElementConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageTerminalTokenElementConsumer.java @@ -4,17 +4,13 @@ Generated with Xtext package org.eclipse.xtext.parser.packrat.consumers; import org.eclipse.emf.ecore.EObject; -import org.eclipse.xtext.parser.packrat.ICharSequenceWithOffset; -import org.eclipse.xtext.parser.packrat.IHiddenTokenHandler; -import org.eclipse.xtext.parser.packrat.IMarkerFactory; 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.consumers.INonTerminalConsumerConfiguration; import org.eclipse.xtext.parser.packrat.consumers.ConsumeResult; 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.services.XtextGrammarTestLanguageGrammarAccess; import org.eclipse.xtext.services.XtextGrammarTestLanguageGrammarAccess.TerminalTokenElementElements; @@ -34,10 +30,8 @@ public final class XtextGrammarTestLanguageTerminalTokenElementConsumer extends private XtextGrammarTestLanguageRuleCallConsumer ruleCallConsumer; private XtextGrammarTestLanguageWildcardConsumer wildcardConsumer; - public XtextGrammarTestLanguageTerminalTokenElementConsumer(ICharSequenceWithOffset input, IMarkerFactory markerFactory, - IParsedTokenAcceptor tokenAcceptor, IHiddenTokenHandler hiddenTokenHandler, IConsumerUtility consumerUtil, - ITerminalConsumer[] hiddenTokens) { - super(input, markerFactory, tokenAcceptor, hiddenTokenHandler, consumerUtil, hiddenTokens); + public XtextGrammarTestLanguageTerminalTokenElementConsumer(INonTerminalConsumerConfiguration configuration, ITerminalConsumer[] hiddenTokens) { + super(configuration, hiddenTokens); } protected int doConsume() throws Exception { diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageTypeRefConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageTypeRefConsumer.java index 244647e..c0cb787 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageTypeRefConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageTypeRefConsumer.java @@ -4,17 +4,13 @@ Generated with Xtext package org.eclipse.xtext.parser.packrat.consumers; import org.eclipse.emf.ecore.EObject; -import org.eclipse.xtext.parser.packrat.ICharSequenceWithOffset; -import org.eclipse.xtext.parser.packrat.IHiddenTokenHandler; -import org.eclipse.xtext.parser.packrat.IMarkerFactory; 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.consumers.INonTerminalConsumerConfiguration; import org.eclipse.xtext.parser.packrat.consumers.ConsumeResult; 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.services.XtextGrammarTestLanguageGrammarAccess; import org.eclipse.xtext.services.XtextGrammarTestLanguageGrammarAccess.TypeRefElements; @@ -32,10 +28,8 @@ public final class XtextGrammarTestLanguageTypeRefConsumer extends NonTerminalCo private ICharacterClass keyword$6$Delimiter; - public XtextGrammarTestLanguageTypeRefConsumer(ICharSequenceWithOffset input, IMarkerFactory markerFactory, - IParsedTokenAcceptor tokenAcceptor, IHiddenTokenHandler hiddenTokenHandler, IConsumerUtility consumerUtil, - ITerminalConsumer[] hiddenTokens) { - super(input, markerFactory, tokenAcceptor, hiddenTokenHandler, consumerUtil, hiddenTokens); + public XtextGrammarTestLanguageTypeRefConsumer(INonTerminalConsumerConfiguration configuration, ITerminalConsumer[] hiddenTokens) { + super(configuration, hiddenTokens); crossReference$4$Delimiter = ISequenceMatcher.Factory.nullMatcher(); crossReference$8$Delimiter = ISequenceMatcher.Factory.nullMatcher(); keyword$6$Delimiter = ICharacterClass.Factory.nullClass(); diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageUpToTokenConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageUpToTokenConsumer.java index 4c2c2ba..9853b55 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageUpToTokenConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageUpToTokenConsumer.java @@ -4,17 +4,13 @@ Generated with Xtext package org.eclipse.xtext.parser.packrat.consumers; import org.eclipse.emf.ecore.EObject; -import org.eclipse.xtext.parser.packrat.ICharSequenceWithOffset; -import org.eclipse.xtext.parser.packrat.IHiddenTokenHandler; -import org.eclipse.xtext.parser.packrat.IMarkerFactory; 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.consumers.INonTerminalConsumerConfiguration; import org.eclipse.xtext.parser.packrat.consumers.ConsumeResult; 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.services.XtextGrammarTestLanguageGrammarAccess; import org.eclipse.xtext.services.XtextGrammarTestLanguageGrammarAccess.UpToTokenElements; @@ -28,10 +24,8 @@ public final class XtextGrammarTestLanguageUpToTokenConsumer extends NonTerminal private ICharacterClass keyword$2$Delimiter; - public XtextGrammarTestLanguageUpToTokenConsumer(ICharSequenceWithOffset input, IMarkerFactory markerFactory, - IParsedTokenAcceptor tokenAcceptor, IHiddenTokenHandler hiddenTokenHandler, IConsumerUtility consumerUtil, - ITerminalConsumer[] hiddenTokens) { - super(input, markerFactory, tokenAcceptor, hiddenTokenHandler, consumerUtil, hiddenTokens); + public XtextGrammarTestLanguageUpToTokenConsumer(INonTerminalConsumerConfiguration configuration, ITerminalConsumer[] hiddenTokens) { + super(configuration, hiddenTokens); keyword$2$Delimiter = ICharacterClass.Factory.nullClass(); } diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageWildcardConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageWildcardConsumer.java index d2fe5c2..0e17116 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageWildcardConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/packrat/consumers/XtextGrammarTestLanguageWildcardConsumer.java @@ -4,17 +4,13 @@ Generated with Xtext package org.eclipse.xtext.parser.packrat.consumers; import org.eclipse.emf.ecore.EObject; -import org.eclipse.xtext.parser.packrat.ICharSequenceWithOffset; -import org.eclipse.xtext.parser.packrat.IHiddenTokenHandler; -import org.eclipse.xtext.parser.packrat.IMarkerFactory; 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.consumers.INonTerminalConsumerConfiguration; import org.eclipse.xtext.parser.packrat.consumers.ConsumeResult; 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.services.XtextGrammarTestLanguageGrammarAccess; import org.eclipse.xtext.services.XtextGrammarTestLanguageGrammarAccess.WildcardElements; @@ -26,10 +22,8 @@ public final class XtextGrammarTestLanguageWildcardConsumer extends NonTerminalC private ICharacterClass keyword$2$Delimiter; - public XtextGrammarTestLanguageWildcardConsumer(ICharSequenceWithOffset input, IMarkerFactory markerFactory, - IParsedTokenAcceptor tokenAcceptor, IHiddenTokenHandler hiddenTokenHandler, IConsumerUtility consumerUtil, - ITerminalConsumer[] hiddenTokens) { - super(input, markerFactory, tokenAcceptor, hiddenTokenHandler, consumerUtil, hiddenTokens); + public XtextGrammarTestLanguageWildcardConsumer(INonTerminalConsumerConfiguration configuration, ITerminalConsumer[] hiddenTokens) { + super(configuration, hiddenTokens); keyword$2$Delimiter = ICharacterClass.Factory.nullClass(); } diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/HiddenTerminalsTestLanguagePackratParser.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/HiddenTerminalsTestLanguagePackratParser.java index bb59016..0920173 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/HiddenTerminalsTestLanguagePackratParser.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/HiddenTerminalsTestLanguagePackratParser.java @@ -4,19 +4,13 @@ Generated with Xtext package org.eclipse.xtext.parser.terminalrules.parser.packrat; import org.eclipse.xtext.parser.packrat.AbstractPackratParser; -import org.eclipse.xtext.parser.packrat.ICharSequenceWithOffset; -import org.eclipse.xtext.parser.packrat.IHiddenTokenHandler; -import org.eclipse.xtext.parser.packrat.IMarkerFactory; -import org.eclipse.xtext.parser.packrat.consumers.IConsumerUtility; -import org.eclipse.xtext.parser.packrat.tokens.IParsedTokenAcceptor; +import org.eclipse.xtext.parser.packrat.AbstractParserConfiguration.IInternalParserConfiguration; public class HiddenTerminalsTestLanguagePackratParser extends AbstractPackratParser { @Override - protected HiddenTerminalsTestLanguageParserConfiguration createParserConfiguration(ICharSequenceWithOffset input, - IMarkerFactory markerFactory, IParsedTokenAcceptor tokenAcceptor, IHiddenTokenHandler hiddenTokenHandler, - IConsumerUtility consumerUtil) { - return new HiddenTerminalsTestLanguageParserConfiguration(input, markerFactory, tokenAcceptor, hiddenTokenHandler, consumerUtil); + protected HiddenTerminalsTestLanguageParserConfiguration createParserConfiguration(IInternalParserConfiguration configuration) { + return new HiddenTerminalsTestLanguageParserConfiguration(configuration); } } diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/HiddenTerminalsTestLanguageParserConfiguration.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/HiddenTerminalsTestLanguageParserConfiguration.java index 6e85a6a..142ab4f 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/HiddenTerminalsTestLanguageParserConfiguration.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/HiddenTerminalsTestLanguageParserConfiguration.java @@ -4,13 +4,7 @@ Generated with Xtext package org.eclipse.xtext.parser.terminalrules.parser.packrat; import org.eclipse.xtext.parser.packrat.AbstractParserConfiguration; -import org.eclipse.xtext.parser.packrat.ICharSequenceWithOffset; -import org.eclipse.xtext.parser.packrat.IHiddenTokenHandler; -import org.eclipse.xtext.parser.packrat.IMarkerFactory; -import org.eclipse.xtext.parser.packrat.consumers.IConsumerUtility; -import org.eclipse.xtext.parser.packrat.consumers.INonTerminalConsumer; import org.eclipse.xtext.parser.packrat.consumers.ITerminalConsumer; -import org.eclipse.xtext.parser.packrat.tokens.IParsedTokenAcceptor; import org.eclipse.xtext.parser.terminalrules.parser.packrat.consumers.HiddenTerminalsTestLanguageModelConsumer; import org.eclipse.xtext.parser.terminalrules.parser.packrat.consumers.HiddenTerminalsTestLanguageWithoutHiddensConsumer; @@ -25,6 +19,7 @@ import org.eclipse.xtext.parser.terminalrules.parser.packrat.consumers.HiddenTer import org.eclipse.xtext.parser.terminalrules.parser.packrat.consumers.HiddenTerminalsTestLanguageWSConsumer; import org.eclipse.xtext.parser.terminalrules.parser.packrat.consumers.HiddenTerminalsTestLanguageANY_OTHERConsumer; +@SuppressWarnings("unused") public class HiddenTerminalsTestLanguageParserConfiguration extends AbstractParserConfiguration { private HiddenTerminalsTestLanguageModelConsumer modelConsumer; @@ -40,9 +35,8 @@ public class HiddenTerminalsTestLanguageParserConfiguration extends AbstractPars private HiddenTerminalsTestLanguageWSConsumer wsConsumer; private HiddenTerminalsTestLanguageANY_OTHERConsumer anyOtherConsumer; - public HiddenTerminalsTestLanguageParserConfiguration(ICharSequenceWithOffset input, IMarkerFactory markerFactory, - IParsedTokenAcceptor tokenAcceptor, IHiddenTokenHandler hiddenTokenHandler, IConsumerUtility consumerUtil) { - super(input, markerFactory, tokenAcceptor, hiddenTokenHandler, consumerUtil); + public HiddenTerminalsTestLanguageParserConfiguration(IInternalParserConfiguration configuration) { + super(configuration); } public HiddenTerminalsTestLanguageModelConsumer getRootConsumer() { @@ -51,41 +45,36 @@ public class HiddenTerminalsTestLanguageParserConfiguration extends AbstractPars public void createNonTerminalConsumers() { modelConsumer = new HiddenTerminalsTestLanguageModelConsumer( - getInput(), getMarkerFactory(), getTokenAcceptor(), getHiddenTokenHandler(), getConsumerUtil(), null + this, null ); withoutHiddensConsumer = new HiddenTerminalsTestLanguageWithoutHiddensConsumer( - getInput(), getMarkerFactory(), getTokenAcceptor(), getHiddenTokenHandler(), getConsumerUtil(), null + this, null ); withHiddensConsumer = new HiddenTerminalsTestLanguageWithHiddensConsumer( - getInput(), getMarkerFactory(), getTokenAcceptor(), getHiddenTokenHandler(), getConsumerUtil(), - new ITerminalConsumer[]{ getWsConsumer(), getMlCommentConsumer(), getSlCommentConsumer() } + this, new ITerminalConsumer[]{ getWsConsumer(), getMlCommentConsumer(), getSlCommentConsumer() } ); overridingHiddensConsumer = new HiddenTerminalsTestLanguageOverridingHiddensConsumer( - getInput(), getMarkerFactory(), getTokenAcceptor(), getHiddenTokenHandler(), getConsumerUtil(), - new ITerminalConsumer[]{ getWsConsumer(), getMlCommentConsumer(), getSlCommentConsumer() } + this, new ITerminalConsumer[]{ getWsConsumer(), getMlCommentConsumer(), getSlCommentConsumer() } ); overridingHiddensCallConsumer = new HiddenTerminalsTestLanguageOverridingHiddensCallConsumer( - getInput(), getMarkerFactory(), getTokenAcceptor(), getHiddenTokenHandler(), getConsumerUtil(), - new ITerminalConsumer[]{ } + this, new ITerminalConsumer[]{ } ); inheritingHiddensConsumer = new HiddenTerminalsTestLanguageInheritingHiddensConsumer( - getInput(), getMarkerFactory(), getTokenAcceptor(), getHiddenTokenHandler(), getConsumerUtil(), - new ITerminalConsumer[]{ getWsConsumer(), getMlCommentConsumer(), getSlCommentConsumer() } + this, new ITerminalConsumer[]{ getWsConsumer(), getMlCommentConsumer(), getSlCommentConsumer() } ); hidingHiddensConsumer = new HiddenTerminalsTestLanguageHidingHiddensConsumer( - getInput(), getMarkerFactory(), getTokenAcceptor(), getHiddenTokenHandler(), getConsumerUtil(), - new ITerminalConsumer[]{ } + this, new ITerminalConsumer[]{ } ); inheritingHiddensCallConsumer = new HiddenTerminalsTestLanguageInheritingHiddensCallConsumer( - getInput(), getMarkerFactory(), getTokenAcceptor(), getHiddenTokenHandler(), getConsumerUtil(), null + this, null ); } public void createTerminalConsumers() { - mlCommentConsumer = new HiddenTerminalsTestLanguageML_COMMENTConsumer(getInput(), getMarkerFactory(), getTokenAcceptor()); - slCommentConsumer = new HiddenTerminalsTestLanguageSL_COMMENTConsumer(getInput(), getMarkerFactory(), getTokenAcceptor()); - wsConsumer = new HiddenTerminalsTestLanguageWSConsumer(getInput(), getMarkerFactory(), getTokenAcceptor()); - anyOtherConsumer = new HiddenTerminalsTestLanguageANY_OTHERConsumer(getInput(), getMarkerFactory(), getTokenAcceptor()); + mlCommentConsumer = new HiddenTerminalsTestLanguageML_COMMENTConsumer(this); + slCommentConsumer = new HiddenTerminalsTestLanguageSL_COMMENTConsumer(this); + wsConsumer = new HiddenTerminalsTestLanguageWSConsumer(this); + anyOtherConsumer = new HiddenTerminalsTestLanguageANY_OTHERConsumer(this); } public void configureConsumers() { diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/TerminalRulesTestLanguagePackratParser.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/TerminalRulesTestLanguagePackratParser.java index cbab2e6..f61f753 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/TerminalRulesTestLanguagePackratParser.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/TerminalRulesTestLanguagePackratParser.java @@ -4,19 +4,13 @@ Generated with Xtext package org.eclipse.xtext.parser.terminalrules.parser.packrat; import org.eclipse.xtext.parser.packrat.AbstractPackratParser; -import org.eclipse.xtext.parser.packrat.ICharSequenceWithOffset; -import org.eclipse.xtext.parser.packrat.IHiddenTokenHandler; -import org.eclipse.xtext.parser.packrat.IMarkerFactory; -import org.eclipse.xtext.parser.packrat.consumers.IConsumerUtility; -import org.eclipse.xtext.parser.packrat.tokens.IParsedTokenAcceptor; +import org.eclipse.xtext.parser.packrat.AbstractParserConfiguration.IInternalParserConfiguration; public class TerminalRulesTestLanguagePackratParser extends AbstractPackratParser { @Override - protected TerminalRulesTestLanguageParserConfiguration createParserConfiguration(ICharSequenceWithOffset input, - IMarkerFactory markerFactory, IParsedTokenAcceptor tokenAcceptor, IHiddenTokenHandler hiddenTokenHandler, - IConsumerUtility consumerUtil) { - return new TerminalRulesTestLanguageParserConfiguration(input, markerFactory, tokenAcceptor, hiddenTokenHandler, consumerUtil); + protected TerminalRulesTestLanguageParserConfiguration createParserConfiguration(IInternalParserConfiguration configuration) { + return new TerminalRulesTestLanguageParserConfiguration(configuration); } } diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/TerminalRulesTestLanguageParserConfiguration.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/TerminalRulesTestLanguageParserConfiguration.java index 5a65335..3adf0e9 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/TerminalRulesTestLanguageParserConfiguration.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/TerminalRulesTestLanguageParserConfiguration.java @@ -4,13 +4,7 @@ Generated with Xtext package org.eclipse.xtext.parser.terminalrules.parser.packrat; import org.eclipse.xtext.parser.packrat.AbstractParserConfiguration; -import org.eclipse.xtext.parser.packrat.ICharSequenceWithOffset; -import org.eclipse.xtext.parser.packrat.IHiddenTokenHandler; -import org.eclipse.xtext.parser.packrat.IMarkerFactory; -import org.eclipse.xtext.parser.packrat.consumers.IConsumerUtility; -import org.eclipse.xtext.parser.packrat.consumers.INonTerminalConsumer; import org.eclipse.xtext.parser.packrat.consumers.ITerminalConsumer; -import org.eclipse.xtext.parser.packrat.tokens.IParsedTokenAcceptor; import org.eclipse.xtext.parser.terminalrules.parser.packrat.consumers.TerminalRulesTestLanguageModelConsumer; import org.eclipse.xtext.parser.terminalrules.parser.packrat.consumers.TerminalRulesTestLanguageIDConsumer; @@ -21,6 +15,7 @@ import org.eclipse.xtext.parser.terminalrules.parser.packrat.consumers.TerminalR import org.eclipse.xtext.parser.terminalrules.parser.packrat.consumers.TerminalRulesTestLanguageWSConsumer; import org.eclipse.xtext.parser.terminalrules.parser.packrat.consumers.TerminalRulesTestLanguageANY_OTHERConsumer; +@SuppressWarnings("unused") public class TerminalRulesTestLanguageParserConfiguration extends AbstractParserConfiguration { private TerminalRulesTestLanguageModelConsumer modelConsumer; @@ -32,9 +27,8 @@ public class TerminalRulesTestLanguageParserConfiguration extends AbstractParser private TerminalRulesTestLanguageWSConsumer wsConsumer; private TerminalRulesTestLanguageANY_OTHERConsumer anyOtherConsumer; - public TerminalRulesTestLanguageParserConfiguration(ICharSequenceWithOffset input, IMarkerFactory markerFactory, - IParsedTokenAcceptor tokenAcceptor, IHiddenTokenHandler hiddenTokenHandler, IConsumerUtility consumerUtil) { - super(input, markerFactory, tokenAcceptor, hiddenTokenHandler, consumerUtil); + public TerminalRulesTestLanguageParserConfiguration(IInternalParserConfiguration configuration) { + super(configuration); } public TerminalRulesTestLanguageModelConsumer getRootConsumer() { @@ -43,18 +37,18 @@ public class TerminalRulesTestLanguageParserConfiguration extends AbstractParser public void createNonTerminalConsumers() { modelConsumer = new TerminalRulesTestLanguageModelConsumer( - getInput(), getMarkerFactory(), getTokenAcceptor(), getHiddenTokenHandler(), getConsumerUtil(), null + this, null ); } public void createTerminalConsumers() { - idConsumer = new TerminalRulesTestLanguageIDConsumer(getInput(), getMarkerFactory(), getTokenAcceptor()); - intConsumer = new TerminalRulesTestLanguageINTConsumer(getInput(), getMarkerFactory(), getTokenAcceptor()); - stringConsumer = new TerminalRulesTestLanguageSTRINGConsumer(getInput(), getMarkerFactory(), getTokenAcceptor()); - mlCommentConsumer = new TerminalRulesTestLanguageML_COMMENTConsumer(getInput(), getMarkerFactory(), getTokenAcceptor()); - slCommentConsumer = new TerminalRulesTestLanguageSL_COMMENTConsumer(getInput(), getMarkerFactory(), getTokenAcceptor()); - wsConsumer = new TerminalRulesTestLanguageWSConsumer(getInput(), getMarkerFactory(), getTokenAcceptor()); - anyOtherConsumer = new TerminalRulesTestLanguageANY_OTHERConsumer(getInput(), getMarkerFactory(), getTokenAcceptor()); + idConsumer = new TerminalRulesTestLanguageIDConsumer(this); + intConsumer = new TerminalRulesTestLanguageINTConsumer(this); + stringConsumer = new TerminalRulesTestLanguageSTRINGConsumer(this); + mlCommentConsumer = new TerminalRulesTestLanguageML_COMMENTConsumer(this); + slCommentConsumer = new TerminalRulesTestLanguageSL_COMMENTConsumer(this); + wsConsumer = new TerminalRulesTestLanguageWSConsumer(this); + anyOtherConsumer = new TerminalRulesTestLanguageANY_OTHERConsumer(this); } public void configureConsumers() { diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/XtextTerminalsTestLanguagePackratParser.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/XtextTerminalsTestLanguagePackratParser.java index 57a9b11..10d0205 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/XtextTerminalsTestLanguagePackratParser.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/XtextTerminalsTestLanguagePackratParser.java @@ -4,19 +4,13 @@ Generated with Xtext package org.eclipse.xtext.parser.terminalrules.parser.packrat; import org.eclipse.xtext.parser.packrat.AbstractPackratParser; -import org.eclipse.xtext.parser.packrat.ICharSequenceWithOffset; -import org.eclipse.xtext.parser.packrat.IHiddenTokenHandler; -import org.eclipse.xtext.parser.packrat.IMarkerFactory; -import org.eclipse.xtext.parser.packrat.consumers.IConsumerUtility; -import org.eclipse.xtext.parser.packrat.tokens.IParsedTokenAcceptor; +import org.eclipse.xtext.parser.packrat.AbstractParserConfiguration.IInternalParserConfiguration; public class XtextTerminalsTestLanguagePackratParser extends AbstractPackratParser { @Override - protected XtextTerminalsTestLanguageParserConfiguration createParserConfiguration(ICharSequenceWithOffset input, - IMarkerFactory markerFactory, IParsedTokenAcceptor tokenAcceptor, IHiddenTokenHandler hiddenTokenHandler, - IConsumerUtility consumerUtil) { - return new XtextTerminalsTestLanguageParserConfiguration(input, markerFactory, tokenAcceptor, hiddenTokenHandler, consumerUtil); + protected XtextTerminalsTestLanguageParserConfiguration createParserConfiguration(IInternalParserConfiguration configuration) { + return new XtextTerminalsTestLanguageParserConfiguration(configuration); } } diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/XtextTerminalsTestLanguageParserConfiguration.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/XtextTerminalsTestLanguageParserConfiguration.java index 9e69dad..fabdfd3 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/XtextTerminalsTestLanguageParserConfiguration.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/XtextTerminalsTestLanguageParserConfiguration.java @@ -4,13 +4,7 @@ Generated with Xtext package org.eclipse.xtext.parser.terminalrules.parser.packrat; import org.eclipse.xtext.parser.packrat.AbstractParserConfiguration; -import org.eclipse.xtext.parser.packrat.ICharSequenceWithOffset; -import org.eclipse.xtext.parser.packrat.IHiddenTokenHandler; -import org.eclipse.xtext.parser.packrat.IMarkerFactory; -import org.eclipse.xtext.parser.packrat.consumers.IConsumerUtility; -import org.eclipse.xtext.parser.packrat.consumers.INonTerminalConsumer; import org.eclipse.xtext.parser.packrat.consumers.ITerminalConsumer; -import org.eclipse.xtext.parser.packrat.tokens.IParsedTokenAcceptor; import org.eclipse.xtext.parser.terminalrules.parser.packrat.consumers.XtextTerminalsTestLanguageGrammarConsumer; import org.eclipse.xtext.parser.terminalrules.parser.packrat.consumers.XtextTerminalsTestLanguageAbstractRuleConsumer; @@ -49,6 +43,7 @@ import org.eclipse.xtext.parser.terminalrules.parser.packrat.consumers.XtextTerm import org.eclipse.xtext.parser.terminalrules.parser.packrat.consumers.XtextTerminalsTestLanguageWSConsumer; import org.eclipse.xtext.parser.terminalrules.parser.packrat.consumers.XtextTerminalsTestLanguageANY_OTHERConsumer; +@SuppressWarnings("unused") public class XtextTerminalsTestLanguageParserConfiguration extends AbstractParserConfiguration { private XtextTerminalsTestLanguageGrammarConsumer grammarConsumer; @@ -88,9 +83,8 @@ public class XtextTerminalsTestLanguageParserConfiguration extends AbstractParse private XtextTerminalsTestLanguageWSConsumer wsConsumer; private XtextTerminalsTestLanguageANY_OTHERConsumer anyOtherConsumer; - public XtextTerminalsTestLanguageParserConfiguration(ICharSequenceWithOffset input, IMarkerFactory markerFactory, - IParsedTokenAcceptor tokenAcceptor, IHiddenTokenHandler hiddenTokenHandler, IConsumerUtility consumerUtil) { - super(input, markerFactory, tokenAcceptor, hiddenTokenHandler, consumerUtil); + public XtextTerminalsTestLanguageParserConfiguration(IInternalParserConfiguration configuration) { + super(configuration); } public XtextTerminalsTestLanguageGrammarConsumer getRootConsumer() { @@ -99,103 +93,102 @@ public class XtextTerminalsTestLanguageParserConfiguration extends AbstractParse public void createNonTerminalConsumers() { grammarConsumer = new XtextTerminalsTestLanguageGrammarConsumer( - getInput(), getMarkerFactory(), getTokenAcceptor(), getHiddenTokenHandler(), getConsumerUtil(), - new ITerminalConsumer[]{ getWsConsumer(), getMlCommentConsumer(), getSlCommentConsumer() } + this, new ITerminalConsumer[]{ getWsConsumer(), getMlCommentConsumer(), getSlCommentConsumer() } ); abstractRuleConsumer = new XtextTerminalsTestLanguageAbstractRuleConsumer( - getInput(), getMarkerFactory(), getTokenAcceptor(), getHiddenTokenHandler(), getConsumerUtil(), null + this, null ); abstractMetamodelDeclarationConsumer = new XtextTerminalsTestLanguageAbstractMetamodelDeclarationConsumer( - getInput(), getMarkerFactory(), getTokenAcceptor(), getHiddenTokenHandler(), getConsumerUtil(), null + this, null ); generatedMetamodelConsumer = new XtextTerminalsTestLanguageGeneratedMetamodelConsumer( - getInput(), getMarkerFactory(), getTokenAcceptor(), getHiddenTokenHandler(), getConsumerUtil(), null + this, null ); referencedMetamodelConsumer = new XtextTerminalsTestLanguageReferencedMetamodelConsumer( - getInput(), getMarkerFactory(), getTokenAcceptor(), getHiddenTokenHandler(), getConsumerUtil(), null + this, null ); lexerRuleConsumer = new XtextTerminalsTestLanguageLexerRuleConsumer( - getInput(), getMarkerFactory(), getTokenAcceptor(), getHiddenTokenHandler(), getConsumerUtil(), null + this, null ); parserRuleConsumer = new XtextTerminalsTestLanguageParserRuleConsumer( - getInput(), getMarkerFactory(), getTokenAcceptor(), getHiddenTokenHandler(), getConsumerUtil(), null + this, null ); terminalRuleConsumer = new XtextTerminalsTestLanguageTerminalRuleConsumer( - getInput(), getMarkerFactory(), getTokenAcceptor(), getHiddenTokenHandler(), getConsumerUtil(), null + this, null ); typeRefConsumer = new XtextTerminalsTestLanguageTypeRefConsumer( - getInput(), getMarkerFactory(), getTokenAcceptor(), getHiddenTokenHandler(), getConsumerUtil(), null + this, null ); alternativesConsumer = new XtextTerminalsTestLanguageAlternativesConsumer( - getInput(), getMarkerFactory(), getTokenAcceptor(), getHiddenTokenHandler(), getConsumerUtil(), null + this, null ); terminalAlternativesConsumer = new XtextTerminalsTestLanguageTerminalAlternativesConsumer( - getInput(), getMarkerFactory(), getTokenAcceptor(), getHiddenTokenHandler(), getConsumerUtil(), null + this, null ); groupConsumer = new XtextTerminalsTestLanguageGroupConsumer( - getInput(), getMarkerFactory(), getTokenAcceptor(), getHiddenTokenHandler(), getConsumerUtil(), null + this, null ); terminalGroupConsumer = new XtextTerminalsTestLanguageTerminalGroupConsumer( - getInput(), getMarkerFactory(), getTokenAcceptor(), getHiddenTokenHandler(), getConsumerUtil(), null + this, null ); abstractTokenConsumer = new XtextTerminalsTestLanguageAbstractTokenConsumer( - getInput(), getMarkerFactory(), getTokenAcceptor(), getHiddenTokenHandler(), getConsumerUtil(), null + this, null ); terminalTokenConsumer = new XtextTerminalsTestLanguageTerminalTokenConsumer( - getInput(), getMarkerFactory(), getTokenAcceptor(), getHiddenTokenHandler(), getConsumerUtil(), null + this, null ); assignmentConsumer = new XtextTerminalsTestLanguageAssignmentConsumer( - getInput(), getMarkerFactory(), getTokenAcceptor(), getHiddenTokenHandler(), getConsumerUtil(), null + this, null ); actionConsumer = new XtextTerminalsTestLanguageActionConsumer( - getInput(), getMarkerFactory(), getTokenAcceptor(), getHiddenTokenHandler(), getConsumerUtil(), null + this, null ); abstractTerminalConsumer = new XtextTerminalsTestLanguageAbstractTerminalConsumer( - getInput(), getMarkerFactory(), getTokenAcceptor(), getHiddenTokenHandler(), getConsumerUtil(), null + this, null ); terminalTokenElementConsumer = new XtextTerminalsTestLanguageTerminalTokenElementConsumer( - getInput(), getMarkerFactory(), getTokenAcceptor(), getHiddenTokenHandler(), getConsumerUtil(), null + this, null ); abstractNegatedTokenConsumer = new XtextTerminalsTestLanguageAbstractNegatedTokenConsumer( - getInput(), getMarkerFactory(), getTokenAcceptor(), getHiddenTokenHandler(), getConsumerUtil(), null + this, null ); negatedTokenConsumer = new XtextTerminalsTestLanguageNegatedTokenConsumer( - getInput(), getMarkerFactory(), getTokenAcceptor(), getHiddenTokenHandler(), getConsumerUtil(), null + this, null ); upToTokenConsumer = new XtextTerminalsTestLanguageUpToTokenConsumer( - getInput(), getMarkerFactory(), getTokenAcceptor(), getHiddenTokenHandler(), getConsumerUtil(), null + this, null ); wildcardConsumer = new XtextTerminalsTestLanguageWildcardConsumer( - getInput(), getMarkerFactory(), getTokenAcceptor(), getHiddenTokenHandler(), getConsumerUtil(), null + this, null ); characterRangeConsumer = new XtextTerminalsTestLanguageCharacterRangeConsumer( - getInput(), getMarkerFactory(), getTokenAcceptor(), getHiddenTokenHandler(), getConsumerUtil(), null + this, null ); crossReferenceConsumer = new XtextTerminalsTestLanguageCrossReferenceConsumer( - getInput(), getMarkerFactory(), getTokenAcceptor(), getHiddenTokenHandler(), getConsumerUtil(), null + this, null ); parenthesizedElementConsumer = new XtextTerminalsTestLanguageParenthesizedElementConsumer( - getInput(), getMarkerFactory(), getTokenAcceptor(), getHiddenTokenHandler(), getConsumerUtil(), null + this, null ); parenthesizedTerminalElementConsumer = new XtextTerminalsTestLanguageParenthesizedTerminalElementConsumer( - getInput(), getMarkerFactory(), getTokenAcceptor(), getHiddenTokenHandler(), getConsumerUtil(), null + this, null ); keywordConsumer = new XtextTerminalsTestLanguageKeywordConsumer( - getInput(), getMarkerFactory(), getTokenAcceptor(), getHiddenTokenHandler(), getConsumerUtil(), null + this, null ); ruleCallConsumer = new XtextTerminalsTestLanguageRuleCallConsumer( - getInput(), getMarkerFactory(), getTokenAcceptor(), getHiddenTokenHandler(), getConsumerUtil(), null + this, null ); } public void createTerminalConsumers() { - idConsumer = new XtextTerminalsTestLanguageIDConsumer(getInput(), getMarkerFactory(), getTokenAcceptor()); - intConsumer = new XtextTerminalsTestLanguageINTConsumer(getInput(), getMarkerFactory(), getTokenAcceptor()); - stringConsumer = new XtextTerminalsTestLanguageSTRINGConsumer(getInput(), getMarkerFactory(), getTokenAcceptor()); - mlCommentConsumer = new XtextTerminalsTestLanguageML_COMMENTConsumer(getInput(), getMarkerFactory(), getTokenAcceptor()); - slCommentConsumer = new XtextTerminalsTestLanguageSL_COMMENTConsumer(getInput(), getMarkerFactory(), getTokenAcceptor()); - wsConsumer = new XtextTerminalsTestLanguageWSConsumer(getInput(), getMarkerFactory(), getTokenAcceptor()); - anyOtherConsumer = new XtextTerminalsTestLanguageANY_OTHERConsumer(getInput(), getMarkerFactory(), getTokenAcceptor()); + idConsumer = new XtextTerminalsTestLanguageIDConsumer(this); + intConsumer = new XtextTerminalsTestLanguageINTConsumer(this); + stringConsumer = new XtextTerminalsTestLanguageSTRINGConsumer(this); + mlCommentConsumer = new XtextTerminalsTestLanguageML_COMMENTConsumer(this); + slCommentConsumer = new XtextTerminalsTestLanguageSL_COMMENTConsumer(this); + wsConsumer = new XtextTerminalsTestLanguageWSConsumer(this); + anyOtherConsumer = new XtextTerminalsTestLanguageANY_OTHERConsumer(this); } public void configureConsumers() { diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/HiddenTerminalsTestLanguageANY_OTHERConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/HiddenTerminalsTestLanguageANY_OTHERConsumer.java index bff2297..7934759 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/HiddenTerminalsTestLanguageANY_OTHERConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/HiddenTerminalsTestLanguageANY_OTHERConsumer.java @@ -4,12 +4,10 @@ Generated with Xtext package org.eclipse.xtext.parser.terminalrules.parser.packrat.consumers; import org.eclipse.xtext.AbstractRule; -import org.eclipse.xtext.parser.packrat.ICharSequenceWithOffset; -import org.eclipse.xtext.parser.packrat.IMarkerFactory; +import org.eclipse.xtext.parser.packrat.consumers.ITerminalConsumerConfiguration; import org.eclipse.xtext.parser.packrat.consumers.AbstractRuleAwareTerminalConsumer; import org.eclipse.xtext.parser.packrat.consumers.ConsumeResult; import org.eclipse.xtext.parser.packrat.matching.ICharacterClass; -import org.eclipse.xtext.parser.packrat.tokens.IParsedTokenAcceptor; import org.eclipse.xtext.parser.terminalrules.services.HiddenTerminalsTestLanguageGrammarAccess; @@ -18,9 +16,8 @@ import org.eclipse.xtext.parser.terminalrules.services.HiddenTerminalsTestLangua public final class HiddenTerminalsTestLanguageANY_OTHERConsumer extends AbstractRuleAwareTerminalConsumer { - public HiddenTerminalsTestLanguageANY_OTHERConsumer(ICharSequenceWithOffset input, IMarkerFactory markerFactory, - IParsedTokenAcceptor tokenAcceptor) { - super(input, markerFactory, tokenAcceptor); + public HiddenTerminalsTestLanguageANY_OTHERConsumer(ITerminalConsumerConfiguration configuration) { + super(configuration); } protected int doConsume() { diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/HiddenTerminalsTestLanguageHidingHiddensConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/HiddenTerminalsTestLanguageHidingHiddensConsumer.java index 0f0b65f..319a020 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/HiddenTerminalsTestLanguageHidingHiddensConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/HiddenTerminalsTestLanguageHidingHiddensConsumer.java @@ -4,17 +4,13 @@ Generated with Xtext package org.eclipse.xtext.parser.terminalrules.parser.packrat.consumers; import org.eclipse.emf.ecore.EObject; -import org.eclipse.xtext.parser.packrat.ICharSequenceWithOffset; -import org.eclipse.xtext.parser.packrat.IHiddenTokenHandler; -import org.eclipse.xtext.parser.packrat.IMarkerFactory; 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.consumers.INonTerminalConsumerConfiguration; import org.eclipse.xtext.parser.packrat.consumers.ConsumeResult; 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.parser.terminalrules.services.HiddenTerminalsTestLanguageGrammarAccess; import org.eclipse.xtext.parser.terminalrules.services.HiddenTerminalsTestLanguageGrammarAccess.HidingHiddensElements; @@ -32,10 +28,8 @@ public final class HiddenTerminalsTestLanguageHidingHiddensConsumer extends NonT private ISequenceMatcher ruleCall$5$Delimiter; - public HiddenTerminalsTestLanguageHidingHiddensConsumer(ICharSequenceWithOffset input, IMarkerFactory markerFactory, - IParsedTokenAcceptor tokenAcceptor, IHiddenTokenHandler hiddenTokenHandler, IConsumerUtility consumerUtil, - ITerminalConsumer[] hiddenTokens) { - super(input, markerFactory, tokenAcceptor, hiddenTokenHandler, consumerUtil, hiddenTokens); + public HiddenTerminalsTestLanguageHidingHiddensConsumer(INonTerminalConsumerConfiguration configuration, ITerminalConsumer[] hiddenTokens) { + super(configuration, hiddenTokens); keyword$3$Delimiter = ICharacterClass.Factory.nullClass(); ruleCall$5$Delimiter = ISequenceMatcher.Factory.nullMatcher(); } diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/HiddenTerminalsTestLanguageInheritingHiddensCallConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/HiddenTerminalsTestLanguageInheritingHiddensCallConsumer.java index 1fb106f..1dcee63 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/HiddenTerminalsTestLanguageInheritingHiddensCallConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/HiddenTerminalsTestLanguageInheritingHiddensCallConsumer.java @@ -4,17 +4,13 @@ Generated with Xtext package org.eclipse.xtext.parser.terminalrules.parser.packrat.consumers; import org.eclipse.emf.ecore.EObject; -import org.eclipse.xtext.parser.packrat.ICharSequenceWithOffset; -import org.eclipse.xtext.parser.packrat.IHiddenTokenHandler; -import org.eclipse.xtext.parser.packrat.IMarkerFactory; 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.consumers.INonTerminalConsumerConfiguration; import org.eclipse.xtext.parser.packrat.consumers.ConsumeResult; 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.parser.terminalrules.services.HiddenTerminalsTestLanguageGrammarAccess; import org.eclipse.xtext.parser.terminalrules.services.HiddenTerminalsTestLanguageGrammarAccess.InheritingHiddensCallElements; @@ -28,10 +24,8 @@ public final class HiddenTerminalsTestLanguageInheritingHiddensCallConsumer exte private ICharacterClass keyword$4$Delimiter; - public HiddenTerminalsTestLanguageInheritingHiddensCallConsumer(ICharSequenceWithOffset input, IMarkerFactory markerFactory, - IParsedTokenAcceptor tokenAcceptor, IHiddenTokenHandler hiddenTokenHandler, IConsumerUtility consumerUtil, - ITerminalConsumer[] hiddenTokens) { - super(input, markerFactory, tokenAcceptor, hiddenTokenHandler, consumerUtil, hiddenTokens); + public HiddenTerminalsTestLanguageInheritingHiddensCallConsumer(INonTerminalConsumerConfiguration configuration, ITerminalConsumer[] hiddenTokens) { + super(configuration, hiddenTokens); keyword$2$Delimiter = ICharacterClass.Factory.nullClass(); keyword$4$Delimiter = ICharacterClass.Factory.nullClass(); } diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/HiddenTerminalsTestLanguageInheritingHiddensConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/HiddenTerminalsTestLanguageInheritingHiddensConsumer.java index d1ba269..91c20f5 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/HiddenTerminalsTestLanguageInheritingHiddensConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/HiddenTerminalsTestLanguageInheritingHiddensConsumer.java @@ -4,17 +4,13 @@ Generated with Xtext package org.eclipse.xtext.parser.terminalrules.parser.packrat.consumers; import org.eclipse.emf.ecore.EObject; -import org.eclipse.xtext.parser.packrat.ICharSequenceWithOffset; -import org.eclipse.xtext.parser.packrat.IHiddenTokenHandler; -import org.eclipse.xtext.parser.packrat.IMarkerFactory; 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.consumers.INonTerminalConsumerConfiguration; import org.eclipse.xtext.parser.packrat.consumers.ConsumeResult; 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.parser.terminalrules.services.HiddenTerminalsTestLanguageGrammarAccess; import org.eclipse.xtext.parser.terminalrules.services.HiddenTerminalsTestLanguageGrammarAccess.InheritingHiddensElements; @@ -38,10 +34,8 @@ public final class HiddenTerminalsTestLanguageInheritingHiddensConsumer extends private ICharacterClass keyword$16$Delimiter; - public HiddenTerminalsTestLanguageInheritingHiddensConsumer(ICharSequenceWithOffset input, IMarkerFactory markerFactory, - IParsedTokenAcceptor tokenAcceptor, IHiddenTokenHandler hiddenTokenHandler, IConsumerUtility consumerUtil, - ITerminalConsumer[] hiddenTokens) { - super(input, markerFactory, tokenAcceptor, hiddenTokenHandler, consumerUtil, hiddenTokens); + public HiddenTerminalsTestLanguageInheritingHiddensConsumer(INonTerminalConsumerConfiguration configuration, ITerminalConsumer[] hiddenTokens) { + super(configuration, hiddenTokens); keyword$6$Delimiter = ICharacterClass.Factory.nullClass(); keyword$7$Delimiter = ICharacterClass.Factory.nullClass(); keyword$8$Delimiter = ICharacterClass.Factory.nullClass(); diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/HiddenTerminalsTestLanguageML_COMMENTConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/HiddenTerminalsTestLanguageML_COMMENTConsumer.java index c50f90f..341d00f 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/HiddenTerminalsTestLanguageML_COMMENTConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/HiddenTerminalsTestLanguageML_COMMENTConsumer.java @@ -4,12 +4,10 @@ Generated with Xtext package org.eclipse.xtext.parser.terminalrules.parser.packrat.consumers; import org.eclipse.xtext.AbstractRule; -import org.eclipse.xtext.parser.packrat.ICharSequenceWithOffset; -import org.eclipse.xtext.parser.packrat.IMarkerFactory; +import org.eclipse.xtext.parser.packrat.consumers.ITerminalConsumerConfiguration; import org.eclipse.xtext.parser.packrat.consumers.AbstractRuleAwareTerminalConsumer; import org.eclipse.xtext.parser.packrat.consumers.ConsumeResult; import org.eclipse.xtext.parser.packrat.matching.ICharacterClass; -import org.eclipse.xtext.parser.packrat.tokens.IParsedTokenAcceptor; import org.eclipse.xtext.parser.terminalrules.services.HiddenTerminalsTestLanguageGrammarAccess; @@ -18,9 +16,8 @@ import org.eclipse.xtext.parser.terminalrules.services.HiddenTerminalsTestLangua public final class HiddenTerminalsTestLanguageML_COMMENTConsumer extends AbstractRuleAwareTerminalConsumer { - public HiddenTerminalsTestLanguageML_COMMENTConsumer(ICharSequenceWithOffset input, IMarkerFactory markerFactory, - IParsedTokenAcceptor tokenAcceptor) { - super(input, markerFactory, tokenAcceptor); + public HiddenTerminalsTestLanguageML_COMMENTConsumer(ITerminalConsumerConfiguration configuration) { + super(configuration); } protected int doConsume() { diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/HiddenTerminalsTestLanguageModelConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/HiddenTerminalsTestLanguageModelConsumer.java index c4e0918..e0504cc 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/HiddenTerminalsTestLanguageModelConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/HiddenTerminalsTestLanguageModelConsumer.java @@ -4,17 +4,13 @@ Generated with Xtext package org.eclipse.xtext.parser.terminalrules.parser.packrat.consumers; import org.eclipse.emf.ecore.EObject; -import org.eclipse.xtext.parser.packrat.ICharSequenceWithOffset; -import org.eclipse.xtext.parser.packrat.IHiddenTokenHandler; -import org.eclipse.xtext.parser.packrat.IMarkerFactory; 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.consumers.INonTerminalConsumerConfiguration; import org.eclipse.xtext.parser.packrat.consumers.ConsumeResult; 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.parser.terminalrules.services.HiddenTerminalsTestLanguageGrammarAccess; import org.eclipse.xtext.parser.terminalrules.services.HiddenTerminalsTestLanguageGrammarAccess.ModelElements; @@ -32,10 +28,8 @@ public final class HiddenTerminalsTestLanguageModelConsumer extends NonTerminalC private HiddenTerminalsTestLanguageWithHiddensConsumer withHiddensConsumer; private HiddenTerminalsTestLanguageWithoutHiddensConsumer withoutHiddensConsumer; - public HiddenTerminalsTestLanguageModelConsumer(ICharSequenceWithOffset input, IMarkerFactory markerFactory, - IParsedTokenAcceptor tokenAcceptor, IHiddenTokenHandler hiddenTokenHandler, IConsumerUtility consumerUtil, - ITerminalConsumer[] hiddenTokens) { - super(input, markerFactory, tokenAcceptor, hiddenTokenHandler, consumerUtil, hiddenTokens); + public HiddenTerminalsTestLanguageModelConsumer(INonTerminalConsumerConfiguration configuration, ITerminalConsumer[] hiddenTokens) { + super(configuration, hiddenTokens); } protected int doConsume() throws Exception { diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/HiddenTerminalsTestLanguageOverridingHiddensCallConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/HiddenTerminalsTestLanguageOverridingHiddensCallConsumer.java index b7f2dde..f36dc60 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/HiddenTerminalsTestLanguageOverridingHiddensCallConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/HiddenTerminalsTestLanguageOverridingHiddensCallConsumer.java @@ -4,17 +4,13 @@ Generated with Xtext package org.eclipse.xtext.parser.terminalrules.parser.packrat.consumers; import org.eclipse.emf.ecore.EObject; -import org.eclipse.xtext.parser.packrat.ICharSequenceWithOffset; -import org.eclipse.xtext.parser.packrat.IHiddenTokenHandler; -import org.eclipse.xtext.parser.packrat.IMarkerFactory; 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.consumers.INonTerminalConsumerConfiguration; import org.eclipse.xtext.parser.packrat.consumers.ConsumeResult; 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.parser.terminalrules.services.HiddenTerminalsTestLanguageGrammarAccess; import org.eclipse.xtext.parser.terminalrules.services.HiddenTerminalsTestLanguageGrammarAccess.OverridingHiddensCallElements; @@ -32,10 +28,8 @@ public final class HiddenTerminalsTestLanguageOverridingHiddensCallConsumer exte private ISequenceMatcher ruleCall$5$Delimiter; - public HiddenTerminalsTestLanguageOverridingHiddensCallConsumer(ICharSequenceWithOffset input, IMarkerFactory markerFactory, - IParsedTokenAcceptor tokenAcceptor, IHiddenTokenHandler hiddenTokenHandler, IConsumerUtility consumerUtil, - ITerminalConsumer[] hiddenTokens) { - super(input, markerFactory, tokenAcceptor, hiddenTokenHandler, consumerUtil, hiddenTokens); + public HiddenTerminalsTestLanguageOverridingHiddensCallConsumer(INonTerminalConsumerConfiguration configuration, ITerminalConsumer[] hiddenTokens) { + super(configuration, hiddenTokens); keyword$3$Delimiter = ICharacterClass.Factory.nullClass(); keyword$7$Delimiter = ICharacterClass.Factory.nullClass(); ruleCall$5$Delimiter = ISequenceMatcher.Factory.nullMatcher(); diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/HiddenTerminalsTestLanguageOverridingHiddensConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/HiddenTerminalsTestLanguageOverridingHiddensConsumer.java index a9033b3..4e28aec 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/HiddenTerminalsTestLanguageOverridingHiddensConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/HiddenTerminalsTestLanguageOverridingHiddensConsumer.java @@ -4,17 +4,13 @@ Generated with Xtext package org.eclipse.xtext.parser.terminalrules.parser.packrat.consumers; import org.eclipse.emf.ecore.EObject; -import org.eclipse.xtext.parser.packrat.ICharSequenceWithOffset; -import org.eclipse.xtext.parser.packrat.IHiddenTokenHandler; -import org.eclipse.xtext.parser.packrat.IMarkerFactory; 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.consumers.INonTerminalConsumerConfiguration; import org.eclipse.xtext.parser.packrat.consumers.ConsumeResult; 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.parser.terminalrules.services.HiddenTerminalsTestLanguageGrammarAccess; import org.eclipse.xtext.parser.terminalrules.services.HiddenTerminalsTestLanguageGrammarAccess.OverridingHiddensElements; @@ -36,10 +32,8 @@ public final class HiddenTerminalsTestLanguageOverridingHiddensConsumer extends private ICharacterClass keyword$13$Delimiter; - public HiddenTerminalsTestLanguageOverridingHiddensConsumer(ICharSequenceWithOffset input, IMarkerFactory markerFactory, - IParsedTokenAcceptor tokenAcceptor, IHiddenTokenHandler hiddenTokenHandler, IConsumerUtility consumerUtil, - ITerminalConsumer[] hiddenTokens) { - super(input, markerFactory, tokenAcceptor, hiddenTokenHandler, consumerUtil, hiddenTokens); + public HiddenTerminalsTestLanguageOverridingHiddensConsumer(INonTerminalConsumerConfiguration configuration, ITerminalConsumer[] hiddenTokens) { + super(configuration, hiddenTokens); keyword$6$Delimiter = ICharacterClass.Factory.nullClass(); keyword$7$Delimiter = ICharacterClass.Factory.nullClass(); keyword$8$Delimiter = ICharacterClass.Factory.nullClass(); diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/HiddenTerminalsTestLanguageSL_COMMENTConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/HiddenTerminalsTestLanguageSL_COMMENTConsumer.java index 243a823..123f58e 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/HiddenTerminalsTestLanguageSL_COMMENTConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/HiddenTerminalsTestLanguageSL_COMMENTConsumer.java @@ -4,12 +4,10 @@ Generated with Xtext package org.eclipse.xtext.parser.terminalrules.parser.packrat.consumers; import org.eclipse.xtext.AbstractRule; -import org.eclipse.xtext.parser.packrat.ICharSequenceWithOffset; -import org.eclipse.xtext.parser.packrat.IMarkerFactory; +import org.eclipse.xtext.parser.packrat.consumers.ITerminalConsumerConfiguration; import org.eclipse.xtext.parser.packrat.consumers.AbstractRuleAwareTerminalConsumer; import org.eclipse.xtext.parser.packrat.consumers.ConsumeResult; import org.eclipse.xtext.parser.packrat.matching.ICharacterClass; -import org.eclipse.xtext.parser.packrat.tokens.IParsedTokenAcceptor; import org.eclipse.xtext.parser.terminalrules.services.HiddenTerminalsTestLanguageGrammarAccess; @@ -18,9 +16,8 @@ import org.eclipse.xtext.parser.terminalrules.services.HiddenTerminalsTestLangua public final class HiddenTerminalsTestLanguageSL_COMMENTConsumer extends AbstractRuleAwareTerminalConsumer { - public HiddenTerminalsTestLanguageSL_COMMENTConsumer(ICharSequenceWithOffset input, IMarkerFactory markerFactory, - IParsedTokenAcceptor tokenAcceptor) { - super(input, markerFactory, tokenAcceptor); + public HiddenTerminalsTestLanguageSL_COMMENTConsumer(ITerminalConsumerConfiguration configuration) { + super(configuration); } protected int doConsume() { diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/HiddenTerminalsTestLanguageWSConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/HiddenTerminalsTestLanguageWSConsumer.java index 8abbf77..072f6cb 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/HiddenTerminalsTestLanguageWSConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/HiddenTerminalsTestLanguageWSConsumer.java @@ -4,12 +4,10 @@ Generated with Xtext package org.eclipse.xtext.parser.terminalrules.parser.packrat.consumers; import org.eclipse.xtext.AbstractRule; -import org.eclipse.xtext.parser.packrat.ICharSequenceWithOffset; -import org.eclipse.xtext.parser.packrat.IMarkerFactory; +import org.eclipse.xtext.parser.packrat.consumers.ITerminalConsumerConfiguration; import org.eclipse.xtext.parser.packrat.consumers.AbstractRuleAwareTerminalConsumer; import org.eclipse.xtext.parser.packrat.consumers.ConsumeResult; import org.eclipse.xtext.parser.packrat.matching.ICharacterClass; -import org.eclipse.xtext.parser.packrat.tokens.IParsedTokenAcceptor; import org.eclipse.xtext.parser.terminalrules.services.HiddenTerminalsTestLanguageGrammarAccess; @@ -18,9 +16,8 @@ import org.eclipse.xtext.parser.terminalrules.services.HiddenTerminalsTestLangua public final class HiddenTerminalsTestLanguageWSConsumer extends AbstractRuleAwareTerminalConsumer { - public HiddenTerminalsTestLanguageWSConsumer(ICharSequenceWithOffset input, IMarkerFactory markerFactory, - IParsedTokenAcceptor tokenAcceptor) { - super(input, markerFactory, tokenAcceptor); + public HiddenTerminalsTestLanguageWSConsumer(ITerminalConsumerConfiguration configuration) { + super(configuration); } protected int doConsume() { diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/HiddenTerminalsTestLanguageWithHiddensConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/HiddenTerminalsTestLanguageWithHiddensConsumer.java index c41e49c..665ccdd 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/HiddenTerminalsTestLanguageWithHiddensConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/HiddenTerminalsTestLanguageWithHiddensConsumer.java @@ -4,17 +4,13 @@ Generated with Xtext package org.eclipse.xtext.parser.terminalrules.parser.packrat.consumers; import org.eclipse.emf.ecore.EObject; -import org.eclipse.xtext.parser.packrat.ICharSequenceWithOffset; -import org.eclipse.xtext.parser.packrat.IHiddenTokenHandler; -import org.eclipse.xtext.parser.packrat.IMarkerFactory; 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.consumers.INonTerminalConsumerConfiguration; import org.eclipse.xtext.parser.packrat.consumers.ConsumeResult; 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.parser.terminalrules.services.HiddenTerminalsTestLanguageGrammarAccess; import org.eclipse.xtext.parser.terminalrules.services.HiddenTerminalsTestLanguageGrammarAccess.WithHiddensElements; @@ -30,10 +26,8 @@ public final class HiddenTerminalsTestLanguageWithHiddensConsumer extends NonTer private ICharacterClass keyword$6$Delimiter; - public HiddenTerminalsTestLanguageWithHiddensConsumer(ICharSequenceWithOffset input, IMarkerFactory markerFactory, - IParsedTokenAcceptor tokenAcceptor, IHiddenTokenHandler hiddenTokenHandler, IConsumerUtility consumerUtil, - ITerminalConsumer[] hiddenTokens) { - super(input, markerFactory, tokenAcceptor, hiddenTokenHandler, consumerUtil, hiddenTokens); + public HiddenTerminalsTestLanguageWithHiddensConsumer(INonTerminalConsumerConfiguration configuration, ITerminalConsumer[] hiddenTokens) { + super(configuration, hiddenTokens); keyword$3$Delimiter = ICharacterClass.Factory.nullClass(); keyword$4$Delimiter = ICharacterClass.Factory.nullClass(); keyword$6$Delimiter = ICharacterClass.Factory.nullClass(); diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/HiddenTerminalsTestLanguageWithoutHiddensConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/HiddenTerminalsTestLanguageWithoutHiddensConsumer.java index 3f1ed3a..a8d1c61 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/HiddenTerminalsTestLanguageWithoutHiddensConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/HiddenTerminalsTestLanguageWithoutHiddensConsumer.java @@ -4,17 +4,13 @@ Generated with Xtext package org.eclipse.xtext.parser.terminalrules.parser.packrat.consumers; import org.eclipse.emf.ecore.EObject; -import org.eclipse.xtext.parser.packrat.ICharSequenceWithOffset; -import org.eclipse.xtext.parser.packrat.IHiddenTokenHandler; -import org.eclipse.xtext.parser.packrat.IMarkerFactory; 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.consumers.INonTerminalConsumerConfiguration; import org.eclipse.xtext.parser.packrat.consumers.ConsumeResult; 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.parser.terminalrules.services.HiddenTerminalsTestLanguageGrammarAccess; import org.eclipse.xtext.parser.terminalrules.services.HiddenTerminalsTestLanguageGrammarAccess.WithoutHiddensElements; @@ -36,10 +32,8 @@ public final class HiddenTerminalsTestLanguageWithoutHiddensConsumer extends Non private ISequenceMatcher ruleCall$10$Delimiter; - public HiddenTerminalsTestLanguageWithoutHiddensConsumer(ICharSequenceWithOffset input, IMarkerFactory markerFactory, - IParsedTokenAcceptor tokenAcceptor, IHiddenTokenHandler hiddenTokenHandler, IConsumerUtility consumerUtil, - ITerminalConsumer[] hiddenTokens) { - super(input, markerFactory, tokenAcceptor, hiddenTokenHandler, consumerUtil, hiddenTokens); + public HiddenTerminalsTestLanguageWithoutHiddensConsumer(INonTerminalConsumerConfiguration configuration, ITerminalConsumer[] hiddenTokens) { + super(configuration, hiddenTokens); keyword$5$Delimiter = ICharacterClass.Factory.nullClass(); keyword$8$Delimiter = ICharacterClass.Factory.nullClass(); keyword$12$Delimiter = ICharacterClass.Factory.nullClass(); diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/TerminalRulesTestLanguageANY_OTHERConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/TerminalRulesTestLanguageANY_OTHERConsumer.java index 54a2d8c..eada151 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/TerminalRulesTestLanguageANY_OTHERConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/TerminalRulesTestLanguageANY_OTHERConsumer.java @@ -4,12 +4,10 @@ Generated with Xtext package org.eclipse.xtext.parser.terminalrules.parser.packrat.consumers; import org.eclipse.xtext.AbstractRule; -import org.eclipse.xtext.parser.packrat.ICharSequenceWithOffset; -import org.eclipse.xtext.parser.packrat.IMarkerFactory; +import org.eclipse.xtext.parser.packrat.consumers.ITerminalConsumerConfiguration; import org.eclipse.xtext.parser.packrat.consumers.AbstractRuleAwareTerminalConsumer; import org.eclipse.xtext.parser.packrat.consumers.ConsumeResult; import org.eclipse.xtext.parser.packrat.matching.ICharacterClass; -import org.eclipse.xtext.parser.packrat.tokens.IParsedTokenAcceptor; import org.eclipse.xtext.parser.terminalrules.services.TerminalRulesTestLanguageGrammarAccess; @@ -18,9 +16,8 @@ import org.eclipse.xtext.parser.terminalrules.services.TerminalRulesTestLanguage public final class TerminalRulesTestLanguageANY_OTHERConsumer extends AbstractRuleAwareTerminalConsumer { - public TerminalRulesTestLanguageANY_OTHERConsumer(ICharSequenceWithOffset input, IMarkerFactory markerFactory, - IParsedTokenAcceptor tokenAcceptor) { - super(input, markerFactory, tokenAcceptor); + public TerminalRulesTestLanguageANY_OTHERConsumer(ITerminalConsumerConfiguration configuration) { + super(configuration); } protected int doConsume() { diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/TerminalRulesTestLanguageIDConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/TerminalRulesTestLanguageIDConsumer.java index 3a6397f..928cb61 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/TerminalRulesTestLanguageIDConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/TerminalRulesTestLanguageIDConsumer.java @@ -4,12 +4,10 @@ Generated with Xtext package org.eclipse.xtext.parser.terminalrules.parser.packrat.consumers; import org.eclipse.xtext.AbstractRule; -import org.eclipse.xtext.parser.packrat.ICharSequenceWithOffset; -import org.eclipse.xtext.parser.packrat.IMarkerFactory; +import org.eclipse.xtext.parser.packrat.consumers.ITerminalConsumerConfiguration; import org.eclipse.xtext.parser.packrat.consumers.AbstractRuleAwareTerminalConsumer; import org.eclipse.xtext.parser.packrat.consumers.ConsumeResult; import org.eclipse.xtext.parser.packrat.matching.ICharacterClass; -import org.eclipse.xtext.parser.packrat.tokens.IParsedTokenAcceptor; import org.eclipse.xtext.parser.terminalrules.services.TerminalRulesTestLanguageGrammarAccess; @@ -18,9 +16,8 @@ import org.eclipse.xtext.parser.terminalrules.services.TerminalRulesTestLanguage public final class TerminalRulesTestLanguageIDConsumer extends AbstractRuleAwareTerminalConsumer { - public TerminalRulesTestLanguageIDConsumer(ICharSequenceWithOffset input, IMarkerFactory markerFactory, - IParsedTokenAcceptor tokenAcceptor) { - super(input, markerFactory, tokenAcceptor); + public TerminalRulesTestLanguageIDConsumer(ITerminalConsumerConfiguration configuration) { + super(configuration); } protected int doConsume() { diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/TerminalRulesTestLanguageINTConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/TerminalRulesTestLanguageINTConsumer.java index 3b87994..07a8b08 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/TerminalRulesTestLanguageINTConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/TerminalRulesTestLanguageINTConsumer.java @@ -4,12 +4,10 @@ Generated with Xtext package org.eclipse.xtext.parser.terminalrules.parser.packrat.consumers; import org.eclipse.xtext.AbstractRule; -import org.eclipse.xtext.parser.packrat.ICharSequenceWithOffset; -import org.eclipse.xtext.parser.packrat.IMarkerFactory; +import org.eclipse.xtext.parser.packrat.consumers.ITerminalConsumerConfiguration; import org.eclipse.xtext.parser.packrat.consumers.AbstractRuleAwareTerminalConsumer; import org.eclipse.xtext.parser.packrat.consumers.ConsumeResult; import org.eclipse.xtext.parser.packrat.matching.ICharacterClass; -import org.eclipse.xtext.parser.packrat.tokens.IParsedTokenAcceptor; import org.eclipse.xtext.parser.terminalrules.services.TerminalRulesTestLanguageGrammarAccess; @@ -18,9 +16,8 @@ import org.eclipse.xtext.parser.terminalrules.services.TerminalRulesTestLanguage public final class TerminalRulesTestLanguageINTConsumer extends AbstractRuleAwareTerminalConsumer { - public TerminalRulesTestLanguageINTConsumer(ICharSequenceWithOffset input, IMarkerFactory markerFactory, - IParsedTokenAcceptor tokenAcceptor) { - super(input, markerFactory, tokenAcceptor); + public TerminalRulesTestLanguageINTConsumer(ITerminalConsumerConfiguration configuration) { + super(configuration); } protected int doConsume() { diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/TerminalRulesTestLanguageML_COMMENTConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/TerminalRulesTestLanguageML_COMMENTConsumer.java index c15a35b..95982a0 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/TerminalRulesTestLanguageML_COMMENTConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/TerminalRulesTestLanguageML_COMMENTConsumer.java @@ -4,12 +4,10 @@ Generated with Xtext package org.eclipse.xtext.parser.terminalrules.parser.packrat.consumers; import org.eclipse.xtext.AbstractRule; -import org.eclipse.xtext.parser.packrat.ICharSequenceWithOffset; -import org.eclipse.xtext.parser.packrat.IMarkerFactory; +import org.eclipse.xtext.parser.packrat.consumers.ITerminalConsumerConfiguration; import org.eclipse.xtext.parser.packrat.consumers.AbstractRuleAwareTerminalConsumer; import org.eclipse.xtext.parser.packrat.consumers.ConsumeResult; import org.eclipse.xtext.parser.packrat.matching.ICharacterClass; -import org.eclipse.xtext.parser.packrat.tokens.IParsedTokenAcceptor; import org.eclipse.xtext.parser.terminalrules.services.TerminalRulesTestLanguageGrammarAccess; @@ -18,9 +16,8 @@ import org.eclipse.xtext.parser.terminalrules.services.TerminalRulesTestLanguage public final class TerminalRulesTestLanguageML_COMMENTConsumer extends AbstractRuleAwareTerminalConsumer { - public TerminalRulesTestLanguageML_COMMENTConsumer(ICharSequenceWithOffset input, IMarkerFactory markerFactory, - IParsedTokenAcceptor tokenAcceptor) { - super(input, markerFactory, tokenAcceptor); + public TerminalRulesTestLanguageML_COMMENTConsumer(ITerminalConsumerConfiguration configuration) { + super(configuration); } protected int doConsume() { diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/TerminalRulesTestLanguageModelConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/TerminalRulesTestLanguageModelConsumer.java index 10dfee5..9a5e6bf 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/TerminalRulesTestLanguageModelConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/TerminalRulesTestLanguageModelConsumer.java @@ -4,17 +4,13 @@ Generated with Xtext package org.eclipse.xtext.parser.terminalrules.parser.packrat.consumers; import org.eclipse.emf.ecore.EObject; -import org.eclipse.xtext.parser.packrat.ICharSequenceWithOffset; -import org.eclipse.xtext.parser.packrat.IHiddenTokenHandler; -import org.eclipse.xtext.parser.packrat.IMarkerFactory; 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.consumers.INonTerminalConsumerConfiguration; import org.eclipse.xtext.parser.packrat.consumers.ConsumeResult; 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.parser.terminalrules.services.TerminalRulesTestLanguageGrammarAccess; import org.eclipse.xtext.parser.terminalrules.services.TerminalRulesTestLanguageGrammarAccess.ModelElements; @@ -52,10 +48,8 @@ public final class TerminalRulesTestLanguageModelConsumer extends NonTerminalCon private ISequenceMatcher ruleCall$20$Delimiter; - public TerminalRulesTestLanguageModelConsumer(ICharSequenceWithOffset input, IMarkerFactory markerFactory, - IParsedTokenAcceptor tokenAcceptor, IHiddenTokenHandler hiddenTokenHandler, IConsumerUtility consumerUtil, - ITerminalConsumer[] hiddenTokens) { - super(input, markerFactory, tokenAcceptor, hiddenTokenHandler, consumerUtil, hiddenTokens); + public TerminalRulesTestLanguageModelConsumer(INonTerminalConsumerConfiguration configuration, ITerminalConsumer[] hiddenTokens) { + super(configuration, hiddenTokens); ruleCall$8$Delimiter = ISequenceMatcher.Factory.nullMatcher(); ruleCall$10$Delimiter = ISequenceMatcher.Factory.nullMatcher(); ruleCall$12$Delimiter = ISequenceMatcher.Factory.nullMatcher(); diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/TerminalRulesTestLanguageSL_COMMENTConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/TerminalRulesTestLanguageSL_COMMENTConsumer.java index 3db10f7..b382829 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/TerminalRulesTestLanguageSL_COMMENTConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/TerminalRulesTestLanguageSL_COMMENTConsumer.java @@ -4,12 +4,10 @@ Generated with Xtext package org.eclipse.xtext.parser.terminalrules.parser.packrat.consumers; import org.eclipse.xtext.AbstractRule; -import org.eclipse.xtext.parser.packrat.ICharSequenceWithOffset; -import org.eclipse.xtext.parser.packrat.IMarkerFactory; +import org.eclipse.xtext.parser.packrat.consumers.ITerminalConsumerConfiguration; import org.eclipse.xtext.parser.packrat.consumers.AbstractRuleAwareTerminalConsumer; import org.eclipse.xtext.parser.packrat.consumers.ConsumeResult; import org.eclipse.xtext.parser.packrat.matching.ICharacterClass; -import org.eclipse.xtext.parser.packrat.tokens.IParsedTokenAcceptor; import org.eclipse.xtext.parser.terminalrules.services.TerminalRulesTestLanguageGrammarAccess; @@ -18,9 +16,8 @@ import org.eclipse.xtext.parser.terminalrules.services.TerminalRulesTestLanguage public final class TerminalRulesTestLanguageSL_COMMENTConsumer extends AbstractRuleAwareTerminalConsumer { - public TerminalRulesTestLanguageSL_COMMENTConsumer(ICharSequenceWithOffset input, IMarkerFactory markerFactory, - IParsedTokenAcceptor tokenAcceptor) { - super(input, markerFactory, tokenAcceptor); + public TerminalRulesTestLanguageSL_COMMENTConsumer(ITerminalConsumerConfiguration configuration) { + super(configuration); } protected int doConsume() { diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/TerminalRulesTestLanguageSTRINGConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/TerminalRulesTestLanguageSTRINGConsumer.java index d12d97b..499d78b 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/TerminalRulesTestLanguageSTRINGConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/TerminalRulesTestLanguageSTRINGConsumer.java @@ -4,12 +4,10 @@ Generated with Xtext package org.eclipse.xtext.parser.terminalrules.parser.packrat.consumers; import org.eclipse.xtext.AbstractRule; -import org.eclipse.xtext.parser.packrat.ICharSequenceWithOffset; -import org.eclipse.xtext.parser.packrat.IMarkerFactory; +import org.eclipse.xtext.parser.packrat.consumers.ITerminalConsumerConfiguration; import org.eclipse.xtext.parser.packrat.consumers.AbstractRuleAwareTerminalConsumer; import org.eclipse.xtext.parser.packrat.consumers.ConsumeResult; import org.eclipse.xtext.parser.packrat.matching.ICharacterClass; -import org.eclipse.xtext.parser.packrat.tokens.IParsedTokenAcceptor; import org.eclipse.xtext.parser.terminalrules.services.TerminalRulesTestLanguageGrammarAccess; @@ -18,9 +16,8 @@ import org.eclipse.xtext.parser.terminalrules.services.TerminalRulesTestLanguage public final class TerminalRulesTestLanguageSTRINGConsumer extends AbstractRuleAwareTerminalConsumer { - public TerminalRulesTestLanguageSTRINGConsumer(ICharSequenceWithOffset input, IMarkerFactory markerFactory, - IParsedTokenAcceptor tokenAcceptor) { - super(input, markerFactory, tokenAcceptor); + public TerminalRulesTestLanguageSTRINGConsumer(ITerminalConsumerConfiguration configuration) { + super(configuration); } protected int doConsume() { diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/TerminalRulesTestLanguageWSConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/TerminalRulesTestLanguageWSConsumer.java index fe783fb..540a89f 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/TerminalRulesTestLanguageWSConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/TerminalRulesTestLanguageWSConsumer.java @@ -4,12 +4,10 @@ Generated with Xtext package org.eclipse.xtext.parser.terminalrules.parser.packrat.consumers; import org.eclipse.xtext.AbstractRule; -import org.eclipse.xtext.parser.packrat.ICharSequenceWithOffset; -import org.eclipse.xtext.parser.packrat.IMarkerFactory; +import org.eclipse.xtext.parser.packrat.consumers.ITerminalConsumerConfiguration; import org.eclipse.xtext.parser.packrat.consumers.AbstractRuleAwareTerminalConsumer; import org.eclipse.xtext.parser.packrat.consumers.ConsumeResult; import org.eclipse.xtext.parser.packrat.matching.ICharacterClass; -import org.eclipse.xtext.parser.packrat.tokens.IParsedTokenAcceptor; import org.eclipse.xtext.parser.terminalrules.services.TerminalRulesTestLanguageGrammarAccess; @@ -18,9 +16,8 @@ import org.eclipse.xtext.parser.terminalrules.services.TerminalRulesTestLanguage public final class TerminalRulesTestLanguageWSConsumer extends AbstractRuleAwareTerminalConsumer { - public TerminalRulesTestLanguageWSConsumer(ICharSequenceWithOffset input, IMarkerFactory markerFactory, - IParsedTokenAcceptor tokenAcceptor) { - super(input, markerFactory, tokenAcceptor); + public TerminalRulesTestLanguageWSConsumer(ITerminalConsumerConfiguration configuration) { + super(configuration); } protected int doConsume() { diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageANY_OTHERConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageANY_OTHERConsumer.java index c221ad6..7a9ed18 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageANY_OTHERConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageANY_OTHERConsumer.java @@ -4,12 +4,10 @@ Generated with Xtext package org.eclipse.xtext.parser.terminalrules.parser.packrat.consumers; import org.eclipse.xtext.AbstractRule; -import org.eclipse.xtext.parser.packrat.ICharSequenceWithOffset; -import org.eclipse.xtext.parser.packrat.IMarkerFactory; +import org.eclipse.xtext.parser.packrat.consumers.ITerminalConsumerConfiguration; import org.eclipse.xtext.parser.packrat.consumers.AbstractRuleAwareTerminalConsumer; import org.eclipse.xtext.parser.packrat.consumers.ConsumeResult; import org.eclipse.xtext.parser.packrat.matching.ICharacterClass; -import org.eclipse.xtext.parser.packrat.tokens.IParsedTokenAcceptor; import org.eclipse.xtext.parser.terminalrules.services.XtextTerminalsTestLanguageGrammarAccess; @@ -18,9 +16,8 @@ import org.eclipse.xtext.parser.terminalrules.services.XtextTerminalsTestLanguag public final class XtextTerminalsTestLanguageANY_OTHERConsumer extends AbstractRuleAwareTerminalConsumer { - public XtextTerminalsTestLanguageANY_OTHERConsumer(ICharSequenceWithOffset input, IMarkerFactory markerFactory, - IParsedTokenAcceptor tokenAcceptor) { - super(input, markerFactory, tokenAcceptor); + public XtextTerminalsTestLanguageANY_OTHERConsumer(ITerminalConsumerConfiguration configuration) { + super(configuration); } protected int doConsume() { diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageAbstractMetamodelDeclarationConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageAbstractMetamodelDeclarationConsumer.java index c591abc..93e364e 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageAbstractMetamodelDeclarationConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageAbstractMetamodelDeclarationConsumer.java @@ -4,17 +4,13 @@ Generated with Xtext package org.eclipse.xtext.parser.terminalrules.parser.packrat.consumers; import org.eclipse.emf.ecore.EObject; -import org.eclipse.xtext.parser.packrat.ICharSequenceWithOffset; -import org.eclipse.xtext.parser.packrat.IHiddenTokenHandler; -import org.eclipse.xtext.parser.packrat.IMarkerFactory; 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.consumers.INonTerminalConsumerConfiguration; import org.eclipse.xtext.parser.packrat.consumers.ConsumeResult; 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.parser.terminalrules.services.XtextTerminalsTestLanguageGrammarAccess; import org.eclipse.xtext.parser.terminalrules.services.XtextTerminalsTestLanguageGrammarAccess.AbstractMetamodelDeclarationElements; @@ -28,10 +24,8 @@ public final class XtextTerminalsTestLanguageAbstractMetamodelDeclarationConsume private XtextTerminalsTestLanguageGeneratedMetamodelConsumer generatedMetamodelConsumer; private XtextTerminalsTestLanguageReferencedMetamodelConsumer referencedMetamodelConsumer; - public XtextTerminalsTestLanguageAbstractMetamodelDeclarationConsumer(ICharSequenceWithOffset input, IMarkerFactory markerFactory, - IParsedTokenAcceptor tokenAcceptor, IHiddenTokenHandler hiddenTokenHandler, IConsumerUtility consumerUtil, - ITerminalConsumer[] hiddenTokens) { - super(input, markerFactory, tokenAcceptor, hiddenTokenHandler, consumerUtil, hiddenTokens); + public XtextTerminalsTestLanguageAbstractMetamodelDeclarationConsumer(INonTerminalConsumerConfiguration configuration, ITerminalConsumer[] hiddenTokens) { + super(configuration, hiddenTokens); } protected int doConsume() throws Exception { diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageAbstractNegatedTokenConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageAbstractNegatedTokenConsumer.java index 2dbd86c..edce191 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageAbstractNegatedTokenConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageAbstractNegatedTokenConsumer.java @@ -4,17 +4,13 @@ Generated with Xtext package org.eclipse.xtext.parser.terminalrules.parser.packrat.consumers; import org.eclipse.emf.ecore.EObject; -import org.eclipse.xtext.parser.packrat.ICharSequenceWithOffset; -import org.eclipse.xtext.parser.packrat.IHiddenTokenHandler; -import org.eclipse.xtext.parser.packrat.IMarkerFactory; 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.consumers.INonTerminalConsumerConfiguration; import org.eclipse.xtext.parser.packrat.consumers.ConsumeResult; 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.parser.terminalrules.services.XtextTerminalsTestLanguageGrammarAccess; import org.eclipse.xtext.parser.terminalrules.services.XtextTerminalsTestLanguageGrammarAccess.AbstractNegatedTokenElements; @@ -28,10 +24,8 @@ public final class XtextTerminalsTestLanguageAbstractNegatedTokenConsumer extend private XtextTerminalsTestLanguageNegatedTokenConsumer negatedTokenConsumer; private XtextTerminalsTestLanguageUpToTokenConsumer upToTokenConsumer; - public XtextTerminalsTestLanguageAbstractNegatedTokenConsumer(ICharSequenceWithOffset input, IMarkerFactory markerFactory, - IParsedTokenAcceptor tokenAcceptor, IHiddenTokenHandler hiddenTokenHandler, IConsumerUtility consumerUtil, - ITerminalConsumer[] hiddenTokens) { - super(input, markerFactory, tokenAcceptor, hiddenTokenHandler, consumerUtil, hiddenTokens); + public XtextTerminalsTestLanguageAbstractNegatedTokenConsumer(INonTerminalConsumerConfiguration configuration, ITerminalConsumer[] hiddenTokens) { + super(configuration, hiddenTokens); } protected int doConsume() throws Exception { diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageAbstractRuleConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageAbstractRuleConsumer.java index 0c5f375..d11ad25 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageAbstractRuleConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageAbstractRuleConsumer.java @@ -4,17 +4,13 @@ Generated with Xtext package org.eclipse.xtext.parser.terminalrules.parser.packrat.consumers; import org.eclipse.emf.ecore.EObject; -import org.eclipse.xtext.parser.packrat.ICharSequenceWithOffset; -import org.eclipse.xtext.parser.packrat.IHiddenTokenHandler; -import org.eclipse.xtext.parser.packrat.IMarkerFactory; 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.consumers.INonTerminalConsumerConfiguration; import org.eclipse.xtext.parser.packrat.consumers.ConsumeResult; 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.parser.terminalrules.services.XtextTerminalsTestLanguageGrammarAccess; import org.eclipse.xtext.parser.terminalrules.services.XtextTerminalsTestLanguageGrammarAccess.AbstractRuleElements; @@ -30,10 +26,8 @@ public final class XtextTerminalsTestLanguageAbstractRuleConsumer extends NonTer private XtextTerminalsTestLanguageParserRuleConsumer parserRuleConsumer; private XtextTerminalsTestLanguageTerminalRuleConsumer terminalRuleConsumer; - public XtextTerminalsTestLanguageAbstractRuleConsumer(ICharSequenceWithOffset input, IMarkerFactory markerFactory, - IParsedTokenAcceptor tokenAcceptor, IHiddenTokenHandler hiddenTokenHandler, IConsumerUtility consumerUtil, - ITerminalConsumer[] hiddenTokens) { - super(input, markerFactory, tokenAcceptor, hiddenTokenHandler, consumerUtil, hiddenTokens); + public XtextTerminalsTestLanguageAbstractRuleConsumer(INonTerminalConsumerConfiguration configuration, ITerminalConsumer[] hiddenTokens) { + super(configuration, hiddenTokens); } protected int doConsume() throws Exception { diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageAbstractTerminalConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageAbstractTerminalConsumer.java index 6383973..395938b 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageAbstractTerminalConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageAbstractTerminalConsumer.java @@ -4,17 +4,13 @@ Generated with Xtext package org.eclipse.xtext.parser.terminalrules.parser.packrat.consumers; import org.eclipse.emf.ecore.EObject; -import org.eclipse.xtext.parser.packrat.ICharSequenceWithOffset; -import org.eclipse.xtext.parser.packrat.IHiddenTokenHandler; -import org.eclipse.xtext.parser.packrat.IMarkerFactory; 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.consumers.INonTerminalConsumerConfiguration; import org.eclipse.xtext.parser.packrat.consumers.ConsumeResult; 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.parser.terminalrules.services.XtextTerminalsTestLanguageGrammarAccess; import org.eclipse.xtext.parser.terminalrules.services.XtextTerminalsTestLanguageGrammarAccess.AbstractTerminalElements; @@ -32,10 +28,8 @@ public final class XtextTerminalsTestLanguageAbstractTerminalConsumer extends No private XtextTerminalsTestLanguageParenthesizedElementConsumer parenthesizedElementConsumer; private XtextTerminalsTestLanguageRuleCallConsumer ruleCallConsumer; - public XtextTerminalsTestLanguageAbstractTerminalConsumer(ICharSequenceWithOffset input, IMarkerFactory markerFactory, - IParsedTokenAcceptor tokenAcceptor, IHiddenTokenHandler hiddenTokenHandler, IConsumerUtility consumerUtil, - ITerminalConsumer[] hiddenTokens) { - super(input, markerFactory, tokenAcceptor, hiddenTokenHandler, consumerUtil, hiddenTokens); + public XtextTerminalsTestLanguageAbstractTerminalConsumer(INonTerminalConsumerConfiguration configuration, ITerminalConsumer[] hiddenTokens) { + super(configuration, hiddenTokens); } protected int doConsume() throws Exception { diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageAbstractTokenConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageAbstractTokenConsumer.java index 6913150..e5f8ad1 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageAbstractTokenConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageAbstractTokenConsumer.java @@ -4,17 +4,13 @@ Generated with Xtext package org.eclipse.xtext.parser.terminalrules.parser.packrat.consumers; import org.eclipse.emf.ecore.EObject; -import org.eclipse.xtext.parser.packrat.ICharSequenceWithOffset; -import org.eclipse.xtext.parser.packrat.IHiddenTokenHandler; -import org.eclipse.xtext.parser.packrat.IMarkerFactory; 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.consumers.INonTerminalConsumerConfiguration; import org.eclipse.xtext.parser.packrat.consumers.ConsumeResult; 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.parser.terminalrules.services.XtextTerminalsTestLanguageGrammarAccess; import org.eclipse.xtext.parser.terminalrules.services.XtextTerminalsTestLanguageGrammarAccess.AbstractTokenElements; @@ -36,10 +32,8 @@ public final class XtextTerminalsTestLanguageAbstractTokenConsumer extends NonTe private ICharacterClass keyword$12$Delimiter; - public XtextTerminalsTestLanguageAbstractTokenConsumer(ICharSequenceWithOffset input, IMarkerFactory markerFactory, - IParsedTokenAcceptor tokenAcceptor, IHiddenTokenHandler hiddenTokenHandler, IConsumerUtility consumerUtil, - ITerminalConsumer[] hiddenTokens) { - super(input, markerFactory, tokenAcceptor, hiddenTokenHandler, consumerUtil, hiddenTokens); + public XtextTerminalsTestLanguageAbstractTokenConsumer(INonTerminalConsumerConfiguration configuration, ITerminalConsumer[] hiddenTokens) { + super(configuration, hiddenTokens); keyword$10$Delimiter = ICharacterClass.Factory.nullClass(); keyword$11$Delimiter = ICharacterClass.Factory.nullClass(); keyword$12$Delimiter = ICharacterClass.Factory.nullClass(); diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageActionConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageActionConsumer.java index 420acc5..f14220a 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageActionConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageActionConsumer.java @@ -4,17 +4,13 @@ Generated with Xtext package org.eclipse.xtext.parser.terminalrules.parser.packrat.consumers; import org.eclipse.emf.ecore.EObject; -import org.eclipse.xtext.parser.packrat.ICharSequenceWithOffset; -import org.eclipse.xtext.parser.packrat.IHiddenTokenHandler; -import org.eclipse.xtext.parser.packrat.IMarkerFactory; 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.consumers.INonTerminalConsumerConfiguration; import org.eclipse.xtext.parser.packrat.consumers.ConsumeResult; 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.parser.terminalrules.services.XtextTerminalsTestLanguageGrammarAccess; import org.eclipse.xtext.parser.terminalrules.services.XtextTerminalsTestLanguageGrammarAccess.ActionElements; @@ -46,10 +42,8 @@ public final class XtextTerminalsTestLanguageActionConsumer extends NonTerminalC private ISequenceMatcher ruleCall$16$Delimiter; - public XtextTerminalsTestLanguageActionConsumer(ICharSequenceWithOffset input, IMarkerFactory markerFactory, - IParsedTokenAcceptor tokenAcceptor, IHiddenTokenHandler hiddenTokenHandler, IConsumerUtility consumerUtil, - ITerminalConsumer[] hiddenTokens) { - super(input, markerFactory, tokenAcceptor, hiddenTokenHandler, consumerUtil, hiddenTokens); + public XtextTerminalsTestLanguageActionConsumer(INonTerminalConsumerConfiguration configuration, ITerminalConsumer[] hiddenTokens) { + super(configuration, hiddenTokens); keyword$8$Delimiter = ICharacterClass.Factory.nullClass(); keyword$10$Delimiter = ICharacterClass.Factory.nullClass(); keyword$11$Delimiter = ICharacterClass.Factory.nullClass(); diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageAlternativesConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageAlternativesConsumer.java index ec3c83c..88044d4 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageAlternativesConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageAlternativesConsumer.java @@ -4,17 +4,13 @@ Generated with Xtext package org.eclipse.xtext.parser.terminalrules.parser.packrat.consumers; import org.eclipse.emf.ecore.EObject; -import org.eclipse.xtext.parser.packrat.ICharSequenceWithOffset; -import org.eclipse.xtext.parser.packrat.IHiddenTokenHandler; -import org.eclipse.xtext.parser.packrat.IMarkerFactory; 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.consumers.INonTerminalConsumerConfiguration; import org.eclipse.xtext.parser.packrat.consumers.ConsumeResult; 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.parser.terminalrules.services.XtextTerminalsTestLanguageGrammarAccess; import org.eclipse.xtext.parser.terminalrules.services.XtextTerminalsTestLanguageGrammarAccess.AlternativesElements; @@ -28,10 +24,8 @@ public final class XtextTerminalsTestLanguageAlternativesConsumer extends NonTer private ICharacterClass keyword$7$Delimiter; - public XtextTerminalsTestLanguageAlternativesConsumer(ICharSequenceWithOffset input, IMarkerFactory markerFactory, - IParsedTokenAcceptor tokenAcceptor, IHiddenTokenHandler hiddenTokenHandler, IConsumerUtility consumerUtil, - ITerminalConsumer[] hiddenTokens) { - super(input, markerFactory, tokenAcceptor, hiddenTokenHandler, consumerUtil, hiddenTokens); + public XtextTerminalsTestLanguageAlternativesConsumer(INonTerminalConsumerConfiguration configuration, ITerminalConsumer[] hiddenTokens) { + super(configuration, hiddenTokens); keyword$7$Delimiter = ICharacterClass.Factory.nullClass(); } diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageAssignmentConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageAssignmentConsumer.java index c6d9a1e..2dcd08c 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageAssignmentConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageAssignmentConsumer.java @@ -4,17 +4,13 @@ Generated with Xtext package org.eclipse.xtext.parser.terminalrules.parser.packrat.consumers; import org.eclipse.emf.ecore.EObject; -import org.eclipse.xtext.parser.packrat.ICharSequenceWithOffset; -import org.eclipse.xtext.parser.packrat.IHiddenTokenHandler; -import org.eclipse.xtext.parser.packrat.IMarkerFactory; 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.consumers.INonTerminalConsumerConfiguration; import org.eclipse.xtext.parser.packrat.consumers.ConsumeResult; 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.parser.terminalrules.services.XtextTerminalsTestLanguageGrammarAccess; import org.eclipse.xtext.parser.terminalrules.services.XtextTerminalsTestLanguageGrammarAccess.AssignmentElements; @@ -36,10 +32,8 @@ public final class XtextTerminalsTestLanguageAssignmentConsumer extends NonTermi private ISequenceMatcher ruleCall$4$Delimiter; - public XtextTerminalsTestLanguageAssignmentConsumer(ICharSequenceWithOffset input, IMarkerFactory markerFactory, - IParsedTokenAcceptor tokenAcceptor, IHiddenTokenHandler hiddenTokenHandler, IConsumerUtility consumerUtil, - ITerminalConsumer[] hiddenTokens) { - super(input, markerFactory, tokenAcceptor, hiddenTokenHandler, consumerUtil, hiddenTokens); + public XtextTerminalsTestLanguageAssignmentConsumer(INonTerminalConsumerConfiguration configuration, ITerminalConsumer[] hiddenTokens) { + super(configuration, hiddenTokens); keyword$8$Delimiter = ICharacterClass.Factory.nullClass(); keyword$9$Delimiter = ICharacterClass.Factory.nullClass(); keyword$10$Delimiter = ICharacterClass.Factory.nullClass(); diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageCharacterRangeConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageCharacterRangeConsumer.java index aaf977c..5f3c34f 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageCharacterRangeConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageCharacterRangeConsumer.java @@ -4,17 +4,13 @@ Generated with Xtext package org.eclipse.xtext.parser.terminalrules.parser.packrat.consumers; import org.eclipse.emf.ecore.EObject; -import org.eclipse.xtext.parser.packrat.ICharSequenceWithOffset; -import org.eclipse.xtext.parser.packrat.IHiddenTokenHandler; -import org.eclipse.xtext.parser.packrat.IMarkerFactory; 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.consumers.INonTerminalConsumerConfiguration; import org.eclipse.xtext.parser.packrat.consumers.ConsumeResult; 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.parser.terminalrules.services.XtextTerminalsTestLanguageGrammarAccess; import org.eclipse.xtext.parser.terminalrules.services.XtextTerminalsTestLanguageGrammarAccess.CharacterRangeElements; @@ -28,10 +24,8 @@ public final class XtextTerminalsTestLanguageCharacterRangeConsumer extends NonT private ICharacterClass keyword$7$Delimiter; - public XtextTerminalsTestLanguageCharacterRangeConsumer(ICharSequenceWithOffset input, IMarkerFactory markerFactory, - IParsedTokenAcceptor tokenAcceptor, IHiddenTokenHandler hiddenTokenHandler, IConsumerUtility consumerUtil, - ITerminalConsumer[] hiddenTokens) { - super(input, markerFactory, tokenAcceptor, hiddenTokenHandler, consumerUtil, hiddenTokens); + public XtextTerminalsTestLanguageCharacterRangeConsumer(INonTerminalConsumerConfiguration configuration, ITerminalConsumer[] hiddenTokens) { + super(configuration, hiddenTokens); keyword$7$Delimiter = ICharacterClass.Factory.nullClass(); } diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageCrossReferenceConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageCrossReferenceConsumer.java index e208f30..a159f68 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageCrossReferenceConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageCrossReferenceConsumer.java @@ -4,17 +4,13 @@ Generated with Xtext package org.eclipse.xtext.parser.terminalrules.parser.packrat.consumers; import org.eclipse.emf.ecore.EObject; -import org.eclipse.xtext.parser.packrat.ICharSequenceWithOffset; -import org.eclipse.xtext.parser.packrat.IHiddenTokenHandler; -import org.eclipse.xtext.parser.packrat.IMarkerFactory; 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.consumers.INonTerminalConsumerConfiguration; import org.eclipse.xtext.parser.packrat.consumers.ConsumeResult; 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.parser.terminalrules.services.XtextTerminalsTestLanguageGrammarAccess; import org.eclipse.xtext.parser.terminalrules.services.XtextTerminalsTestLanguageGrammarAccess.CrossReferenceElements; @@ -36,10 +32,8 @@ public final class XtextTerminalsTestLanguageCrossReferenceConsumer extends NonT private ICharacterClass keyword$12$Delimiter; - public XtextTerminalsTestLanguageCrossReferenceConsumer(ICharSequenceWithOffset input, IMarkerFactory markerFactory, - IParsedTokenAcceptor tokenAcceptor, IHiddenTokenHandler hiddenTokenHandler, IConsumerUtility consumerUtil, - ITerminalConsumer[] hiddenTokens) { - super(input, markerFactory, tokenAcceptor, hiddenTokenHandler, consumerUtil, hiddenTokens); + public XtextTerminalsTestLanguageCrossReferenceConsumer(INonTerminalConsumerConfiguration configuration, ITerminalConsumer[] hiddenTokens) { + super(configuration, hiddenTokens); crossReference$10$Delimiter = ISequenceMatcher.Factory.nullMatcher(); keyword$4$Delimiter = ICharacterClass.Factory.nullClass(); keyword$8$Delimiter = ICharacterClass.Factory.nullClass(); diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageGeneratedMetamodelConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageGeneratedMetamodelConsumer.java index 4c4014f..924fe5c 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageGeneratedMetamodelConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageGeneratedMetamodelConsumer.java @@ -4,17 +4,13 @@ Generated with Xtext package org.eclipse.xtext.parser.terminalrules.parser.packrat.consumers; import org.eclipse.emf.ecore.EObject; -import org.eclipse.xtext.parser.packrat.ICharSequenceWithOffset; -import org.eclipse.xtext.parser.packrat.IHiddenTokenHandler; -import org.eclipse.xtext.parser.packrat.IMarkerFactory; 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.consumers.INonTerminalConsumerConfiguration; import org.eclipse.xtext.parser.packrat.consumers.ConsumeResult; 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.parser.terminalrules.services.XtextTerminalsTestLanguageGrammarAccess; import org.eclipse.xtext.parser.terminalrules.services.XtextTerminalsTestLanguageGrammarAccess.GeneratedMetamodelElements; @@ -38,10 +34,8 @@ public final class XtextTerminalsTestLanguageGeneratedMetamodelConsumer extends private ISequenceMatcher ruleCall$13$Delimiter; - public XtextTerminalsTestLanguageGeneratedMetamodelConsumer(ICharSequenceWithOffset input, IMarkerFactory markerFactory, - IParsedTokenAcceptor tokenAcceptor, IHiddenTokenHandler hiddenTokenHandler, IConsumerUtility consumerUtil, - ITerminalConsumer[] hiddenTokens) { - super(input, markerFactory, tokenAcceptor, hiddenTokenHandler, consumerUtil, hiddenTokens); + public XtextTerminalsTestLanguageGeneratedMetamodelConsumer(INonTerminalConsumerConfiguration configuration, ITerminalConsumer[] hiddenTokens) { + super(configuration, hiddenTokens); crossReference$8$Delimiter = ISequenceMatcher.Factory.nullMatcher(); keyword$4$Delimiter = ICharacterClass.Factory.nullClass(); keyword$11$Delimiter = ICharacterClass.Factory.nullClass(); diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageGrammarConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageGrammarConsumer.java index b93c6b6..637a14f 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageGrammarConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageGrammarConsumer.java @@ -4,17 +4,13 @@ Generated with Xtext package org.eclipse.xtext.parser.terminalrules.parser.packrat.consumers; import org.eclipse.emf.ecore.EObject; -import org.eclipse.xtext.parser.packrat.ICharSequenceWithOffset; -import org.eclipse.xtext.parser.packrat.IHiddenTokenHandler; -import org.eclipse.xtext.parser.packrat.IMarkerFactory; 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.consumers.INonTerminalConsumerConfiguration; import org.eclipse.xtext.parser.packrat.consumers.ConsumeResult; 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.parser.terminalrules.services.XtextTerminalsTestLanguageGrammarAccess; import org.eclipse.xtext.parser.terminalrules.services.XtextTerminalsTestLanguageGrammarAccess.GrammarElements; @@ -48,10 +44,8 @@ public final class XtextTerminalsTestLanguageGrammarConsumer extends NonTerminal private ISequenceMatcher ruleCall$24$Delimiter; - public XtextTerminalsTestLanguageGrammarConsumer(ICharSequenceWithOffset input, IMarkerFactory markerFactory, - IParsedTokenAcceptor tokenAcceptor, IHiddenTokenHandler hiddenTokenHandler, IConsumerUtility consumerUtil, - ITerminalConsumer[] hiddenTokens) { - super(input, markerFactory, tokenAcceptor, hiddenTokenHandler, consumerUtil, hiddenTokens); + public XtextTerminalsTestLanguageGrammarConsumer(INonTerminalConsumerConfiguration configuration, ITerminalConsumer[] hiddenTokens) { + super(configuration, hiddenTokens); keyword$8$Delimiter = ICharacterClass.Factory.nullClass(); keyword$9$Delimiter = ICharacterClass.Factory.nullClass(); keyword$13$Delimiter = ICharacterClass.Factory.nullClass(); diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageGroupConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageGroupConsumer.java index e38df4e..33f50a2 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageGroupConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageGroupConsumer.java @@ -4,17 +4,13 @@ Generated with Xtext package org.eclipse.xtext.parser.terminalrules.parser.packrat.consumers; import org.eclipse.emf.ecore.EObject; -import org.eclipse.xtext.parser.packrat.ICharSequenceWithOffset; -import org.eclipse.xtext.parser.packrat.IHiddenTokenHandler; -import org.eclipse.xtext.parser.packrat.IMarkerFactory; 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.consumers.INonTerminalConsumerConfiguration; import org.eclipse.xtext.parser.packrat.consumers.ConsumeResult; 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.parser.terminalrules.services.XtextTerminalsTestLanguageGrammarAccess; import org.eclipse.xtext.parser.terminalrules.services.XtextTerminalsTestLanguageGrammarAccess.GroupElements; @@ -26,10 +22,8 @@ public final class XtextTerminalsTestLanguageGroupConsumer extends NonTerminalCo private XtextTerminalsTestLanguageAbstractTokenConsumer abstractTokenConsumer; - public XtextTerminalsTestLanguageGroupConsumer(ICharSequenceWithOffset input, IMarkerFactory markerFactory, - IParsedTokenAcceptor tokenAcceptor, IHiddenTokenHandler hiddenTokenHandler, IConsumerUtility consumerUtil, - ITerminalConsumer[] hiddenTokens) { - super(input, markerFactory, tokenAcceptor, hiddenTokenHandler, consumerUtil, hiddenTokens); + public XtextTerminalsTestLanguageGroupConsumer(INonTerminalConsumerConfiguration configuration, ITerminalConsumer[] hiddenTokens) { + super(configuration, hiddenTokens); } protected int doConsume() throws Exception { diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageIDConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageIDConsumer.java index 04dec9a..750967c 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageIDConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageIDConsumer.java @@ -4,12 +4,10 @@ Generated with Xtext package org.eclipse.xtext.parser.terminalrules.parser.packrat.consumers; import org.eclipse.xtext.AbstractRule; -import org.eclipse.xtext.parser.packrat.ICharSequenceWithOffset; -import org.eclipse.xtext.parser.packrat.IMarkerFactory; +import org.eclipse.xtext.parser.packrat.consumers.ITerminalConsumerConfiguration; import org.eclipse.xtext.parser.packrat.consumers.AbstractRuleAwareTerminalConsumer; import org.eclipse.xtext.parser.packrat.consumers.ConsumeResult; import org.eclipse.xtext.parser.packrat.matching.ICharacterClass; -import org.eclipse.xtext.parser.packrat.tokens.IParsedTokenAcceptor; import org.eclipse.xtext.parser.terminalrules.services.XtextTerminalsTestLanguageGrammarAccess; @@ -18,9 +16,8 @@ import org.eclipse.xtext.parser.terminalrules.services.XtextTerminalsTestLanguag public final class XtextTerminalsTestLanguageIDConsumer extends AbstractRuleAwareTerminalConsumer { - public XtextTerminalsTestLanguageIDConsumer(ICharSequenceWithOffset input, IMarkerFactory markerFactory, - IParsedTokenAcceptor tokenAcceptor) { - super(input, markerFactory, tokenAcceptor); + public XtextTerminalsTestLanguageIDConsumer(ITerminalConsumerConfiguration configuration) { + super(configuration); } protected int doConsume() { diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageINTConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageINTConsumer.java index 1fa0454..c267d23 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageINTConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageINTConsumer.java @@ -4,12 +4,10 @@ Generated with Xtext package org.eclipse.xtext.parser.terminalrules.parser.packrat.consumers; import org.eclipse.xtext.AbstractRule; -import org.eclipse.xtext.parser.packrat.ICharSequenceWithOffset; -import org.eclipse.xtext.parser.packrat.IMarkerFactory; +import org.eclipse.xtext.parser.packrat.consumers.ITerminalConsumerConfiguration; import org.eclipse.xtext.parser.packrat.consumers.AbstractRuleAwareTerminalConsumer; import org.eclipse.xtext.parser.packrat.consumers.ConsumeResult; import org.eclipse.xtext.parser.packrat.matching.ICharacterClass; -import org.eclipse.xtext.parser.packrat.tokens.IParsedTokenAcceptor; import org.eclipse.xtext.parser.terminalrules.services.XtextTerminalsTestLanguageGrammarAccess; @@ -18,9 +16,8 @@ import org.eclipse.xtext.parser.terminalrules.services.XtextTerminalsTestLanguag public final class XtextTerminalsTestLanguageINTConsumer extends AbstractRuleAwareTerminalConsumer { - public XtextTerminalsTestLanguageINTConsumer(ICharSequenceWithOffset input, IMarkerFactory markerFactory, - IParsedTokenAcceptor tokenAcceptor) { - super(input, markerFactory, tokenAcceptor); + public XtextTerminalsTestLanguageINTConsumer(ITerminalConsumerConfiguration configuration) { + super(configuration); } protected int doConsume() { diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageKeywordConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageKeywordConsumer.java index ed2f8d9..57e86e2 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageKeywordConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageKeywordConsumer.java @@ -4,17 +4,13 @@ Generated with Xtext package org.eclipse.xtext.parser.terminalrules.parser.packrat.consumers; import org.eclipse.emf.ecore.EObject; -import org.eclipse.xtext.parser.packrat.ICharSequenceWithOffset; -import org.eclipse.xtext.parser.packrat.IHiddenTokenHandler; -import org.eclipse.xtext.parser.packrat.IMarkerFactory; 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.consumers.INonTerminalConsumerConfiguration; import org.eclipse.xtext.parser.packrat.consumers.ConsumeResult; 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.parser.terminalrules.services.XtextTerminalsTestLanguageGrammarAccess; import org.eclipse.xtext.parser.terminalrules.services.XtextTerminalsTestLanguageGrammarAccess.KeywordElements; @@ -28,10 +24,8 @@ public final class XtextTerminalsTestLanguageKeywordConsumer extends NonTerminal private ISequenceMatcher ruleCall$2$Delimiter; - public XtextTerminalsTestLanguageKeywordConsumer(ICharSequenceWithOffset input, IMarkerFactory markerFactory, - IParsedTokenAcceptor tokenAcceptor, IHiddenTokenHandler hiddenTokenHandler, IConsumerUtility consumerUtil, - ITerminalConsumer[] hiddenTokens) { - super(input, markerFactory, tokenAcceptor, hiddenTokenHandler, consumerUtil, hiddenTokens); + public XtextTerminalsTestLanguageKeywordConsumer(INonTerminalConsumerConfiguration configuration, ITerminalConsumer[] hiddenTokens) { + super(configuration, hiddenTokens); ruleCall$2$Delimiter = ISequenceMatcher.Factory.nullMatcher(); } diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageLexerRuleConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageLexerRuleConsumer.java index bdf192b..bb486d3 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageLexerRuleConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageLexerRuleConsumer.java @@ -4,17 +4,13 @@ Generated with Xtext package org.eclipse.xtext.parser.terminalrules.parser.packrat.consumers; import org.eclipse.emf.ecore.EObject; -import org.eclipse.xtext.parser.packrat.ICharSequenceWithOffset; -import org.eclipse.xtext.parser.packrat.IHiddenTokenHandler; -import org.eclipse.xtext.parser.packrat.IMarkerFactory; 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.consumers.INonTerminalConsumerConfiguration; import org.eclipse.xtext.parser.packrat.consumers.ConsumeResult; 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.parser.terminalrules.services.XtextTerminalsTestLanguageGrammarAccess; import org.eclipse.xtext.parser.terminalrules.services.XtextTerminalsTestLanguageGrammarAccess.LexerRuleElements; @@ -44,10 +40,8 @@ public final class XtextTerminalsTestLanguageLexerRuleConsumer extends NonTermin private ISequenceMatcher ruleCall$17$Delimiter; - public XtextTerminalsTestLanguageLexerRuleConsumer(ICharSequenceWithOffset input, IMarkerFactory markerFactory, - IParsedTokenAcceptor tokenAcceptor, IHiddenTokenHandler hiddenTokenHandler, IConsumerUtility consumerUtil, - ITerminalConsumer[] hiddenTokens) { - super(input, markerFactory, tokenAcceptor, hiddenTokenHandler, consumerUtil, hiddenTokens); + public XtextTerminalsTestLanguageLexerRuleConsumer(INonTerminalConsumerConfiguration configuration, ITerminalConsumer[] hiddenTokens) { + super(configuration, hiddenTokens); keyword$7$Delimiter = ICharacterClass.Factory.nullClass(); keyword$8$Delimiter = ICharacterClass.Factory.nullClass(); keyword$12$Delimiter = ICharacterClass.Factory.nullClass(); diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageML_COMMENTConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageML_COMMENTConsumer.java index 42807a5..55041c8 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageML_COMMENTConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageML_COMMENTConsumer.java @@ -4,12 +4,10 @@ Generated with Xtext package org.eclipse.xtext.parser.terminalrules.parser.packrat.consumers; import org.eclipse.xtext.AbstractRule; -import org.eclipse.xtext.parser.packrat.ICharSequenceWithOffset; -import org.eclipse.xtext.parser.packrat.IMarkerFactory; +import org.eclipse.xtext.parser.packrat.consumers.ITerminalConsumerConfiguration; import org.eclipse.xtext.parser.packrat.consumers.AbstractRuleAwareTerminalConsumer; import org.eclipse.xtext.parser.packrat.consumers.ConsumeResult; import org.eclipse.xtext.parser.packrat.matching.ICharacterClass; -import org.eclipse.xtext.parser.packrat.tokens.IParsedTokenAcceptor; import org.eclipse.xtext.parser.terminalrules.services.XtextTerminalsTestLanguageGrammarAccess; @@ -18,9 +16,8 @@ import org.eclipse.xtext.parser.terminalrules.services.XtextTerminalsTestLanguag public final class XtextTerminalsTestLanguageML_COMMENTConsumer extends AbstractRuleAwareTerminalConsumer { - public XtextTerminalsTestLanguageML_COMMENTConsumer(ICharSequenceWithOffset input, IMarkerFactory markerFactory, - IParsedTokenAcceptor tokenAcceptor) { - super(input, markerFactory, tokenAcceptor); + public XtextTerminalsTestLanguageML_COMMENTConsumer(ITerminalConsumerConfiguration configuration) { + super(configuration); } protected int doConsume() { diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageNegatedTokenConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageNegatedTokenConsumer.java index 555c258..33b1a45 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageNegatedTokenConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageNegatedTokenConsumer.java @@ -4,17 +4,13 @@ Generated with Xtext package org.eclipse.xtext.parser.terminalrules.parser.packrat.consumers; import org.eclipse.emf.ecore.EObject; -import org.eclipse.xtext.parser.packrat.ICharSequenceWithOffset; -import org.eclipse.xtext.parser.packrat.IHiddenTokenHandler; -import org.eclipse.xtext.parser.packrat.IMarkerFactory; 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.consumers.INonTerminalConsumerConfiguration; import org.eclipse.xtext.parser.packrat.consumers.ConsumeResult; 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.parser.terminalrules.services.XtextTerminalsTestLanguageGrammarAccess; import org.eclipse.xtext.parser.terminalrules.services.XtextTerminalsTestLanguageGrammarAccess.NegatedTokenElements; @@ -28,10 +24,8 @@ public final class XtextTerminalsTestLanguageNegatedTokenConsumer extends NonTer private ICharacterClass keyword$2$Delimiter; - public XtextTerminalsTestLanguageNegatedTokenConsumer(ICharSequenceWithOffset input, IMarkerFactory markerFactory, - IParsedTokenAcceptor tokenAcceptor, IHiddenTokenHandler hiddenTokenHandler, IConsumerUtility consumerUtil, - ITerminalConsumer[] hiddenTokens) { - super(input, markerFactory, tokenAcceptor, hiddenTokenHandler, consumerUtil, hiddenTokens); + public XtextTerminalsTestLanguageNegatedTokenConsumer(INonTerminalConsumerConfiguration configuration, ITerminalConsumer[] hiddenTokens) { + super(configuration, hiddenTokens); keyword$2$Delimiter = ICharacterClass.Factory.nullClass(); } diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageParenthesizedElementConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageParenthesizedElementConsumer.java index bb9f7f7..7f88ae7 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageParenthesizedElementConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageParenthesizedElementConsumer.java @@ -4,17 +4,13 @@ Generated with Xtext package org.eclipse.xtext.parser.terminalrules.parser.packrat.consumers; import org.eclipse.emf.ecore.EObject; -import org.eclipse.xtext.parser.packrat.ICharSequenceWithOffset; -import org.eclipse.xtext.parser.packrat.IHiddenTokenHandler; -import org.eclipse.xtext.parser.packrat.IMarkerFactory; 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.consumers.INonTerminalConsumerConfiguration; import org.eclipse.xtext.parser.packrat.consumers.ConsumeResult; 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.parser.terminalrules.services.XtextTerminalsTestLanguageGrammarAccess; import org.eclipse.xtext.parser.terminalrules.services.XtextTerminalsTestLanguageGrammarAccess.ParenthesizedElementElements; @@ -30,10 +26,8 @@ public final class XtextTerminalsTestLanguageParenthesizedElementConsumer extend private ICharacterClass keyword$5$Delimiter; - public XtextTerminalsTestLanguageParenthesizedElementConsumer(ICharSequenceWithOffset input, IMarkerFactory markerFactory, - IParsedTokenAcceptor tokenAcceptor, IHiddenTokenHandler hiddenTokenHandler, IConsumerUtility consumerUtil, - ITerminalConsumer[] hiddenTokens) { - super(input, markerFactory, tokenAcceptor, hiddenTokenHandler, consumerUtil, hiddenTokens); + public XtextTerminalsTestLanguageParenthesizedElementConsumer(INonTerminalConsumerConfiguration configuration, ITerminalConsumer[] hiddenTokens) { + super(configuration, hiddenTokens); keyword$3$Delimiter = ICharacterClass.Factory.nullClass(); keyword$5$Delimiter = ICharacterClass.Factory.nullClass(); } diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageParenthesizedTerminalElementConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageParenthesizedTerminalElementConsumer.java index c7c9ea8..03edbd3 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageParenthesizedTerminalElementConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageParenthesizedTerminalElementConsumer.java @@ -4,17 +4,13 @@ Generated with Xtext package org.eclipse.xtext.parser.terminalrules.parser.packrat.consumers; import org.eclipse.emf.ecore.EObject; -import org.eclipse.xtext.parser.packrat.ICharSequenceWithOffset; -import org.eclipse.xtext.parser.packrat.IHiddenTokenHandler; -import org.eclipse.xtext.parser.packrat.IMarkerFactory; 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.consumers.INonTerminalConsumerConfiguration; import org.eclipse.xtext.parser.packrat.consumers.ConsumeResult; 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.parser.terminalrules.services.XtextTerminalsTestLanguageGrammarAccess; import org.eclipse.xtext.parser.terminalrules.services.XtextTerminalsTestLanguageGrammarAccess.ParenthesizedTerminalElementElements; @@ -30,10 +26,8 @@ public final class XtextTerminalsTestLanguageParenthesizedTerminalElementConsume private ICharacterClass keyword$5$Delimiter; - public XtextTerminalsTestLanguageParenthesizedTerminalElementConsumer(ICharSequenceWithOffset input, IMarkerFactory markerFactory, - IParsedTokenAcceptor tokenAcceptor, IHiddenTokenHandler hiddenTokenHandler, IConsumerUtility consumerUtil, - ITerminalConsumer[] hiddenTokens) { - super(input, markerFactory, tokenAcceptor, hiddenTokenHandler, consumerUtil, hiddenTokens); + public XtextTerminalsTestLanguageParenthesizedTerminalElementConsumer(INonTerminalConsumerConfiguration configuration, ITerminalConsumer[] hiddenTokens) { + super(configuration, hiddenTokens); keyword$3$Delimiter = ICharacterClass.Factory.nullClass(); keyword$5$Delimiter = ICharacterClass.Factory.nullClass(); } diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageParserRuleConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageParserRuleConsumer.java index 4441bb7..04aae94 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageParserRuleConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageParserRuleConsumer.java @@ -4,17 +4,13 @@ Generated with Xtext package org.eclipse.xtext.parser.terminalrules.parser.packrat.consumers; import org.eclipse.emf.ecore.EObject; -import org.eclipse.xtext.parser.packrat.ICharSequenceWithOffset; -import org.eclipse.xtext.parser.packrat.IHiddenTokenHandler; -import org.eclipse.xtext.parser.packrat.IMarkerFactory; 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.consumers.INonTerminalConsumerConfiguration; import org.eclipse.xtext.parser.packrat.consumers.ConsumeResult; 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.parser.terminalrules.services.XtextTerminalsTestLanguageGrammarAccess; import org.eclipse.xtext.parser.terminalrules.services.XtextTerminalsTestLanguageGrammarAccess.ParserRuleElements; @@ -50,10 +46,8 @@ public final class XtextTerminalsTestLanguageParserRuleConsumer extends NonTermi private ISequenceMatcher ruleCall$7$Delimiter; - public XtextTerminalsTestLanguageParserRuleConsumer(ICharSequenceWithOffset input, IMarkerFactory markerFactory, - IParsedTokenAcceptor tokenAcceptor, IHiddenTokenHandler hiddenTokenHandler, IConsumerUtility consumerUtil, - ITerminalConsumer[] hiddenTokens) { - super(input, markerFactory, tokenAcceptor, hiddenTokenHandler, consumerUtil, hiddenTokens); + public XtextTerminalsTestLanguageParserRuleConsumer(INonTerminalConsumerConfiguration configuration, ITerminalConsumer[] hiddenTokens) { + super(configuration, hiddenTokens); crossReference$20$Delimiter = ISequenceMatcher.Factory.nullMatcher(); crossReference$25$Delimiter = ISequenceMatcher.Factory.nullMatcher(); keyword$9$Delimiter = ICharacterClass.Factory.nullClass(); diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageReferencedMetamodelConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageReferencedMetamodelConsumer.java index 727ce4e..8b1a132 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageReferencedMetamodelConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageReferencedMetamodelConsumer.java @@ -4,17 +4,13 @@ Generated with Xtext package org.eclipse.xtext.parser.terminalrules.parser.packrat.consumers; import org.eclipse.emf.ecore.EObject; -import org.eclipse.xtext.parser.packrat.ICharSequenceWithOffset; -import org.eclipse.xtext.parser.packrat.IHiddenTokenHandler; -import org.eclipse.xtext.parser.packrat.IMarkerFactory; 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.consumers.INonTerminalConsumerConfiguration; import org.eclipse.xtext.parser.packrat.consumers.ConsumeResult; 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.parser.terminalrules.services.XtextTerminalsTestLanguageGrammarAccess; import org.eclipse.xtext.parser.terminalrules.services.XtextTerminalsTestLanguageGrammarAccess.ReferencedMetamodelElements; @@ -36,10 +32,8 @@ public final class XtextTerminalsTestLanguageReferencedMetamodelConsumer extends private ISequenceMatcher ruleCall$10$Delimiter; - public XtextTerminalsTestLanguageReferencedMetamodelConsumer(ICharSequenceWithOffset input, IMarkerFactory markerFactory, - IParsedTokenAcceptor tokenAcceptor, IHiddenTokenHandler hiddenTokenHandler, IConsumerUtility consumerUtil, - ITerminalConsumer[] hiddenTokens) { - super(input, markerFactory, tokenAcceptor, hiddenTokenHandler, consumerUtil, hiddenTokens); + public XtextTerminalsTestLanguageReferencedMetamodelConsumer(INonTerminalConsumerConfiguration configuration, ITerminalConsumer[] hiddenTokens) { + super(configuration, hiddenTokens); crossReference$5$Delimiter = ISequenceMatcher.Factory.nullMatcher(); keyword$3$Delimiter = ICharacterClass.Factory.nullClass(); keyword$8$Delimiter = ICharacterClass.Factory.nullClass(); diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageRuleCallConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageRuleCallConsumer.java index 0af3e6e..75d57e9 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageRuleCallConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageRuleCallConsumer.java @@ -4,17 +4,13 @@ Generated with Xtext package org.eclipse.xtext.parser.terminalrules.parser.packrat.consumers; import org.eclipse.emf.ecore.EObject; -import org.eclipse.xtext.parser.packrat.ICharSequenceWithOffset; -import org.eclipse.xtext.parser.packrat.IHiddenTokenHandler; -import org.eclipse.xtext.parser.packrat.IMarkerFactory; 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.consumers.INonTerminalConsumerConfiguration; import org.eclipse.xtext.parser.packrat.consumers.ConsumeResult; 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.parser.terminalrules.services.XtextTerminalsTestLanguageGrammarAccess; import org.eclipse.xtext.parser.terminalrules.services.XtextTerminalsTestLanguageGrammarAccess.RuleCallElements; @@ -28,10 +24,8 @@ public final class XtextTerminalsTestLanguageRuleCallConsumer extends NonTermina private ISequenceMatcher crossReference$2$Delimiter; - public XtextTerminalsTestLanguageRuleCallConsumer(ICharSequenceWithOffset input, IMarkerFactory markerFactory, - IParsedTokenAcceptor tokenAcceptor, IHiddenTokenHandler hiddenTokenHandler, IConsumerUtility consumerUtil, - ITerminalConsumer[] hiddenTokens) { - super(input, markerFactory, tokenAcceptor, hiddenTokenHandler, consumerUtil, hiddenTokens); + public XtextTerminalsTestLanguageRuleCallConsumer(INonTerminalConsumerConfiguration configuration, ITerminalConsumer[] hiddenTokens) { + super(configuration, hiddenTokens); crossReference$2$Delimiter = ISequenceMatcher.Factory.nullMatcher(); } diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageSL_COMMENTConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageSL_COMMENTConsumer.java index eb53522..eeda7aa 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageSL_COMMENTConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageSL_COMMENTConsumer.java @@ -4,12 +4,10 @@ Generated with Xtext package org.eclipse.xtext.parser.terminalrules.parser.packrat.consumers; import org.eclipse.xtext.AbstractRule; -import org.eclipse.xtext.parser.packrat.ICharSequenceWithOffset; -import org.eclipse.xtext.parser.packrat.IMarkerFactory; +import org.eclipse.xtext.parser.packrat.consumers.ITerminalConsumerConfiguration; import org.eclipse.xtext.parser.packrat.consumers.AbstractRuleAwareTerminalConsumer; import org.eclipse.xtext.parser.packrat.consumers.ConsumeResult; import org.eclipse.xtext.parser.packrat.matching.ICharacterClass; -import org.eclipse.xtext.parser.packrat.tokens.IParsedTokenAcceptor; import org.eclipse.xtext.parser.terminalrules.services.XtextTerminalsTestLanguageGrammarAccess; @@ -18,9 +16,8 @@ import org.eclipse.xtext.parser.terminalrules.services.XtextTerminalsTestLanguag public final class XtextTerminalsTestLanguageSL_COMMENTConsumer extends AbstractRuleAwareTerminalConsumer { - public XtextTerminalsTestLanguageSL_COMMENTConsumer(ICharSequenceWithOffset input, IMarkerFactory markerFactory, - IParsedTokenAcceptor tokenAcceptor) { - super(input, markerFactory, tokenAcceptor); + public XtextTerminalsTestLanguageSL_COMMENTConsumer(ITerminalConsumerConfiguration configuration) { + super(configuration); } protected int doConsume() { diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageSTRINGConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageSTRINGConsumer.java index 1c88229..c0acfc3 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageSTRINGConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageSTRINGConsumer.java @@ -4,12 +4,10 @@ Generated with Xtext package org.eclipse.xtext.parser.terminalrules.parser.packrat.consumers; import org.eclipse.xtext.AbstractRule; -import org.eclipse.xtext.parser.packrat.ICharSequenceWithOffset; -import org.eclipse.xtext.parser.packrat.IMarkerFactory; +import org.eclipse.xtext.parser.packrat.consumers.ITerminalConsumerConfiguration; import org.eclipse.xtext.parser.packrat.consumers.AbstractRuleAwareTerminalConsumer; import org.eclipse.xtext.parser.packrat.consumers.ConsumeResult; import org.eclipse.xtext.parser.packrat.matching.ICharacterClass; -import org.eclipse.xtext.parser.packrat.tokens.IParsedTokenAcceptor; import org.eclipse.xtext.parser.terminalrules.services.XtextTerminalsTestLanguageGrammarAccess; @@ -18,9 +16,8 @@ import org.eclipse.xtext.parser.terminalrules.services.XtextTerminalsTestLanguag public final class XtextTerminalsTestLanguageSTRINGConsumer extends AbstractRuleAwareTerminalConsumer { - public XtextTerminalsTestLanguageSTRINGConsumer(ICharSequenceWithOffset input, IMarkerFactory markerFactory, - IParsedTokenAcceptor tokenAcceptor) { - super(input, markerFactory, tokenAcceptor); + public XtextTerminalsTestLanguageSTRINGConsumer(ITerminalConsumerConfiguration configuration) { + super(configuration); } protected int doConsume() { diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageTerminalAlternativesConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageTerminalAlternativesConsumer.java index c311c4a..a05317d 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageTerminalAlternativesConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageTerminalAlternativesConsumer.java @@ -4,17 +4,13 @@ Generated with Xtext package org.eclipse.xtext.parser.terminalrules.parser.packrat.consumers; import org.eclipse.emf.ecore.EObject; -import org.eclipse.xtext.parser.packrat.ICharSequenceWithOffset; -import org.eclipse.xtext.parser.packrat.IHiddenTokenHandler; -import org.eclipse.xtext.parser.packrat.IMarkerFactory; 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.consumers.INonTerminalConsumerConfiguration; import org.eclipse.xtext.parser.packrat.consumers.ConsumeResult; 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.parser.terminalrules.services.XtextTerminalsTestLanguageGrammarAccess; import org.eclipse.xtext.parser.terminalrules.services.XtextTerminalsTestLanguageGrammarAccess.TerminalAlternativesElements; @@ -28,10 +24,8 @@ public final class XtextTerminalsTestLanguageTerminalAlternativesConsumer extend private ICharacterClass keyword$7$Delimiter; - public XtextTerminalsTestLanguageTerminalAlternativesConsumer(ICharSequenceWithOffset input, IMarkerFactory markerFactory, - IParsedTokenAcceptor tokenAcceptor, IHiddenTokenHandler hiddenTokenHandler, IConsumerUtility consumerUtil, - ITerminalConsumer[] hiddenTokens) { - super(input, markerFactory, tokenAcceptor, hiddenTokenHandler, consumerUtil, hiddenTokens); + public XtextTerminalsTestLanguageTerminalAlternativesConsumer(INonTerminalConsumerConfiguration configuration, ITerminalConsumer[] hiddenTokens) { + super(configuration, hiddenTokens); keyword$7$Delimiter = ICharacterClass.Factory.nullClass(); } diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageTerminalGroupConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageTerminalGroupConsumer.java index 2e24c78..f633f61 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageTerminalGroupConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageTerminalGroupConsumer.java @@ -4,17 +4,13 @@ Generated with Xtext package org.eclipse.xtext.parser.terminalrules.parser.packrat.consumers; import org.eclipse.emf.ecore.EObject; -import org.eclipse.xtext.parser.packrat.ICharSequenceWithOffset; -import org.eclipse.xtext.parser.packrat.IHiddenTokenHandler; -import org.eclipse.xtext.parser.packrat.IMarkerFactory; 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.consumers.INonTerminalConsumerConfiguration; import org.eclipse.xtext.parser.packrat.consumers.ConsumeResult; 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.parser.terminalrules.services.XtextTerminalsTestLanguageGrammarAccess; import org.eclipse.xtext.parser.terminalrules.services.XtextTerminalsTestLanguageGrammarAccess.TerminalGroupElements; @@ -26,10 +22,8 @@ public final class XtextTerminalsTestLanguageTerminalGroupConsumer extends NonTe private XtextTerminalsTestLanguageTerminalTokenConsumer terminalTokenConsumer; - public XtextTerminalsTestLanguageTerminalGroupConsumer(ICharSequenceWithOffset input, IMarkerFactory markerFactory, - IParsedTokenAcceptor tokenAcceptor, IHiddenTokenHandler hiddenTokenHandler, IConsumerUtility consumerUtil, - ITerminalConsumer[] hiddenTokens) { - super(input, markerFactory, tokenAcceptor, hiddenTokenHandler, consumerUtil, hiddenTokens); + public XtextTerminalsTestLanguageTerminalGroupConsumer(INonTerminalConsumerConfiguration configuration, ITerminalConsumer[] hiddenTokens) { + super(configuration, hiddenTokens); } protected int doConsume() throws Exception { diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageTerminalRuleConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageTerminalRuleConsumer.java index 858e606..62ec3c7 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageTerminalRuleConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageTerminalRuleConsumer.java @@ -4,17 +4,13 @@ Generated with Xtext package org.eclipse.xtext.parser.terminalrules.parser.packrat.consumers; import org.eclipse.emf.ecore.EObject; -import org.eclipse.xtext.parser.packrat.ICharSequenceWithOffset; -import org.eclipse.xtext.parser.packrat.IHiddenTokenHandler; -import org.eclipse.xtext.parser.packrat.IMarkerFactory; 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.consumers.INonTerminalConsumerConfiguration; import org.eclipse.xtext.parser.packrat.consumers.ConsumeResult; 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.parser.terminalrules.services.XtextTerminalsTestLanguageGrammarAccess; import org.eclipse.xtext.parser.terminalrules.services.XtextTerminalsTestLanguageGrammarAccess.TerminalRuleElements; @@ -40,10 +36,8 @@ public final class XtextTerminalsTestLanguageTerminalRuleConsumer extends NonTer private ISequenceMatcher ruleCall$9$Delimiter; - public XtextTerminalsTestLanguageTerminalRuleConsumer(ICharSequenceWithOffset input, IMarkerFactory markerFactory, - IParsedTokenAcceptor tokenAcceptor, IHiddenTokenHandler hiddenTokenHandler, IConsumerUtility consumerUtil, - ITerminalConsumer[] hiddenTokens) { - super(input, markerFactory, tokenAcceptor, hiddenTokenHandler, consumerUtil, hiddenTokens); + public XtextTerminalsTestLanguageTerminalRuleConsumer(INonTerminalConsumerConfiguration configuration, ITerminalConsumer[] hiddenTokens) { + super(configuration, hiddenTokens); keyword$7$Delimiter = ICharacterClass.Factory.nullClass(); keyword$11$Delimiter = ICharacterClass.Factory.nullClass(); keyword$14$Delimiter = ICharacterClass.Factory.nullClass(); diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageTerminalTokenConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageTerminalTokenConsumer.java index e16336c..7fb9fe6 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageTerminalTokenConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageTerminalTokenConsumer.java @@ -4,17 +4,13 @@ Generated with Xtext package org.eclipse.xtext.parser.terminalrules.parser.packrat.consumers; import org.eclipse.emf.ecore.EObject; -import org.eclipse.xtext.parser.packrat.ICharSequenceWithOffset; -import org.eclipse.xtext.parser.packrat.IHiddenTokenHandler; -import org.eclipse.xtext.parser.packrat.IMarkerFactory; 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.consumers.INonTerminalConsumerConfiguration; import org.eclipse.xtext.parser.packrat.consumers.ConsumeResult; 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.parser.terminalrules.services.XtextTerminalsTestLanguageGrammarAccess; import org.eclipse.xtext.parser.terminalrules.services.XtextTerminalsTestLanguageGrammarAccess.TerminalTokenElements; @@ -32,10 +28,8 @@ public final class XtextTerminalsTestLanguageTerminalTokenConsumer extends NonTe private ICharacterClass keyword$8$Delimiter; - public XtextTerminalsTestLanguageTerminalTokenConsumer(ICharSequenceWithOffset input, IMarkerFactory markerFactory, - IParsedTokenAcceptor tokenAcceptor, IHiddenTokenHandler hiddenTokenHandler, IConsumerUtility consumerUtil, - ITerminalConsumer[] hiddenTokens) { - super(input, markerFactory, tokenAcceptor, hiddenTokenHandler, consumerUtil, hiddenTokens); + public XtextTerminalsTestLanguageTerminalTokenConsumer(INonTerminalConsumerConfiguration configuration, ITerminalConsumer[] hiddenTokens) { + super(configuration, hiddenTokens); keyword$6$Delimiter = ICharacterClass.Factory.nullClass(); keyword$7$Delimiter = ICharacterClass.Factory.nullClass(); keyword$8$Delimiter = ICharacterClass.Factory.nullClass(); diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageTerminalTokenElementConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageTerminalTokenElementConsumer.java index 80473c1..1f76701 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageTerminalTokenElementConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageTerminalTokenElementConsumer.java @@ -4,17 +4,13 @@ Generated with Xtext package org.eclipse.xtext.parser.terminalrules.parser.packrat.consumers; import org.eclipse.emf.ecore.EObject; -import org.eclipse.xtext.parser.packrat.ICharSequenceWithOffset; -import org.eclipse.xtext.parser.packrat.IHiddenTokenHandler; -import org.eclipse.xtext.parser.packrat.IMarkerFactory; 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.consumers.INonTerminalConsumerConfiguration; import org.eclipse.xtext.parser.packrat.consumers.ConsumeResult; 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.parser.terminalrules.services.XtextTerminalsTestLanguageGrammarAccess; import org.eclipse.xtext.parser.terminalrules.services.XtextTerminalsTestLanguageGrammarAccess.TerminalTokenElementElements; @@ -34,10 +30,8 @@ public final class XtextTerminalsTestLanguageTerminalTokenElementConsumer extend private XtextTerminalsTestLanguageRuleCallConsumer ruleCallConsumer; private XtextTerminalsTestLanguageWildcardConsumer wildcardConsumer; - public XtextTerminalsTestLanguageTerminalTokenElementConsumer(ICharSequenceWithOffset input, IMarkerFactory markerFactory, - IParsedTokenAcceptor tokenAcceptor, IHiddenTokenHandler hiddenTokenHandler, IConsumerUtility consumerUtil, - ITerminalConsumer[] hiddenTokens) { - super(input, markerFactory, tokenAcceptor, hiddenTokenHandler, consumerUtil, hiddenTokens); + public XtextTerminalsTestLanguageTerminalTokenElementConsumer(INonTerminalConsumerConfiguration configuration, ITerminalConsumer[] hiddenTokens) { + super(configuration, hiddenTokens); } protected int doConsume() throws Exception { diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageTypeRefConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageTypeRefConsumer.java index ac9f83e..f368e28 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageTypeRefConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageTypeRefConsumer.java @@ -4,17 +4,13 @@ Generated with Xtext package org.eclipse.xtext.parser.terminalrules.parser.packrat.consumers; import org.eclipse.emf.ecore.EObject; -import org.eclipse.xtext.parser.packrat.ICharSequenceWithOffset; -import org.eclipse.xtext.parser.packrat.IHiddenTokenHandler; -import org.eclipse.xtext.parser.packrat.IMarkerFactory; 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.consumers.INonTerminalConsumerConfiguration; import org.eclipse.xtext.parser.packrat.consumers.ConsumeResult; 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.parser.terminalrules.services.XtextTerminalsTestLanguageGrammarAccess; import org.eclipse.xtext.parser.terminalrules.services.XtextTerminalsTestLanguageGrammarAccess.TypeRefElements; @@ -32,10 +28,8 @@ public final class XtextTerminalsTestLanguageTypeRefConsumer extends NonTerminal private ICharacterClass keyword$6$Delimiter; - public XtextTerminalsTestLanguageTypeRefConsumer(ICharSequenceWithOffset input, IMarkerFactory markerFactory, - IParsedTokenAcceptor tokenAcceptor, IHiddenTokenHandler hiddenTokenHandler, IConsumerUtility consumerUtil, - ITerminalConsumer[] hiddenTokens) { - super(input, markerFactory, tokenAcceptor, hiddenTokenHandler, consumerUtil, hiddenTokens); + public XtextTerminalsTestLanguageTypeRefConsumer(INonTerminalConsumerConfiguration configuration, ITerminalConsumer[] hiddenTokens) { + super(configuration, hiddenTokens); crossReference$4$Delimiter = ISequenceMatcher.Factory.nullMatcher(); crossReference$8$Delimiter = ISequenceMatcher.Factory.nullMatcher(); keyword$6$Delimiter = ICharacterClass.Factory.nullClass(); diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageUpToTokenConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageUpToTokenConsumer.java index 2c18b60..750a70b 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageUpToTokenConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageUpToTokenConsumer.java @@ -4,17 +4,13 @@ Generated with Xtext package org.eclipse.xtext.parser.terminalrules.parser.packrat.consumers; import org.eclipse.emf.ecore.EObject; -import org.eclipse.xtext.parser.packrat.ICharSequenceWithOffset; -import org.eclipse.xtext.parser.packrat.IHiddenTokenHandler; -import org.eclipse.xtext.parser.packrat.IMarkerFactory; 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.consumers.INonTerminalConsumerConfiguration; import org.eclipse.xtext.parser.packrat.consumers.ConsumeResult; 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.parser.terminalrules.services.XtextTerminalsTestLanguageGrammarAccess; import org.eclipse.xtext.parser.terminalrules.services.XtextTerminalsTestLanguageGrammarAccess.UpToTokenElements; @@ -28,10 +24,8 @@ public final class XtextTerminalsTestLanguageUpToTokenConsumer extends NonTermin private ICharacterClass keyword$2$Delimiter; - public XtextTerminalsTestLanguageUpToTokenConsumer(ICharSequenceWithOffset input, IMarkerFactory markerFactory, - IParsedTokenAcceptor tokenAcceptor, IHiddenTokenHandler hiddenTokenHandler, IConsumerUtility consumerUtil, - ITerminalConsumer[] hiddenTokens) { - super(input, markerFactory, tokenAcceptor, hiddenTokenHandler, consumerUtil, hiddenTokens); + public XtextTerminalsTestLanguageUpToTokenConsumer(INonTerminalConsumerConfiguration configuration, ITerminalConsumer[] hiddenTokens) { + super(configuration, hiddenTokens); keyword$2$Delimiter = ICharacterClass.Factory.nullClass(); } diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageWSConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageWSConsumer.java index 34ae2e2..e2e81a2 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageWSConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageWSConsumer.java @@ -4,12 +4,10 @@ Generated with Xtext package org.eclipse.xtext.parser.terminalrules.parser.packrat.consumers; import org.eclipse.xtext.AbstractRule; -import org.eclipse.xtext.parser.packrat.ICharSequenceWithOffset; -import org.eclipse.xtext.parser.packrat.IMarkerFactory; +import org.eclipse.xtext.parser.packrat.consumers.ITerminalConsumerConfiguration; import org.eclipse.xtext.parser.packrat.consumers.AbstractRuleAwareTerminalConsumer; import org.eclipse.xtext.parser.packrat.consumers.ConsumeResult; import org.eclipse.xtext.parser.packrat.matching.ICharacterClass; -import org.eclipse.xtext.parser.packrat.tokens.IParsedTokenAcceptor; import org.eclipse.xtext.parser.terminalrules.services.XtextTerminalsTestLanguageGrammarAccess; @@ -18,9 +16,8 @@ import org.eclipse.xtext.parser.terminalrules.services.XtextTerminalsTestLanguag public final class XtextTerminalsTestLanguageWSConsumer extends AbstractRuleAwareTerminalConsumer { - public XtextTerminalsTestLanguageWSConsumer(ICharSequenceWithOffset input, IMarkerFactory markerFactory, - IParsedTokenAcceptor tokenAcceptor) { - super(input, markerFactory, tokenAcceptor); + public XtextTerminalsTestLanguageWSConsumer(ITerminalConsumerConfiguration configuration) { + super(configuration); } protected int doConsume() { diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageWildcardConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageWildcardConsumer.java index 56dacbb..eca4fa4 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageWildcardConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/parser/packrat/consumers/XtextTerminalsTestLanguageWildcardConsumer.java @@ -4,17 +4,13 @@ Generated with Xtext package org.eclipse.xtext.parser.terminalrules.parser.packrat.consumers; import org.eclipse.emf.ecore.EObject; -import org.eclipse.xtext.parser.packrat.ICharSequenceWithOffset; -import org.eclipse.xtext.parser.packrat.IHiddenTokenHandler; -import org.eclipse.xtext.parser.packrat.IMarkerFactory; 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.consumers.INonTerminalConsumerConfiguration; import org.eclipse.xtext.parser.packrat.consumers.ConsumeResult; 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.parser.terminalrules.services.XtextTerminalsTestLanguageGrammarAccess; import org.eclipse.xtext.parser.terminalrules.services.XtextTerminalsTestLanguageGrammarAccess.WildcardElements; @@ -26,10 +22,8 @@ public final class XtextTerminalsTestLanguageWildcardConsumer extends NonTermina private ICharacterClass keyword$2$Delimiter; - public XtextTerminalsTestLanguageWildcardConsumer(ICharSequenceWithOffset input, IMarkerFactory markerFactory, - IParsedTokenAcceptor tokenAcceptor, IHiddenTokenHandler hiddenTokenHandler, IConsumerUtility consumerUtil, - ITerminalConsumer[] hiddenTokens) { - super(input, markerFactory, tokenAcceptor, hiddenTokenHandler, consumerUtil, hiddenTokens); + public XtextTerminalsTestLanguageWildcardConsumer(INonTerminalConsumerConfiguration configuration, ITerminalConsumer[] hiddenTokens) { + super(configuration, hiddenTokens); keyword$2$Delimiter = ICharacterClass.Factory.nullClass(); } diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/formatter/parser/packrat/FormatterTestLanguagePackratParser.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/formatter/parser/packrat/FormatterTestLanguagePackratParser.java index 5aa365c..f93e097 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/formatter/parser/packrat/FormatterTestLanguagePackratParser.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/formatter/parser/packrat/FormatterTestLanguagePackratParser.java @@ -4,19 +4,13 @@ Generated with Xtext package org.eclipse.xtext.parsetree.formatter.parser.packrat; import org.eclipse.xtext.parser.packrat.AbstractPackratParser; -import org.eclipse.xtext.parser.packrat.ICharSequenceWithOffset; -import org.eclipse.xtext.parser.packrat.IHiddenTokenHandler; -import org.eclipse.xtext.parser.packrat.IMarkerFactory; -import org.eclipse.xtext.parser.packrat.consumers.IConsumerUtility; -import org.eclipse.xtext.parser.packrat.tokens.IParsedTokenAcceptor; +import org.eclipse.xtext.parser.packrat.AbstractParserConfiguration.IInternalParserConfiguration; public class FormatterTestLanguagePackratParser extends AbstractPackratParser { @Override - protected FormatterTestLanguageParserConfiguration createParserConfiguration(ICharSequenceWithOffset input, - IMarkerFactory markerFactory, IParsedTokenAcceptor tokenAcceptor, IHiddenTokenHandler hiddenTokenHandler, - IConsumerUtility consumerUtil) { - return new FormatterTestLanguageParserConfiguration(input, markerFactory, tokenAcceptor, hiddenTokenHandler, consumerUtil); + protected FormatterTestLanguageParserConfiguration createParserConfiguration(IInternalParserConfiguration configuration) { + return new FormatterTestLanguageParserConfiguration(configuration); } } diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/formatter/parser/packrat/FormatterTestLanguageParserConfiguration.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/formatter/parser/packrat/FormatterTestLanguageParserConfiguration.java index b10df26..f5cacbb 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/formatter/parser/packrat/FormatterTestLanguageParserConfiguration.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/formatter/parser/packrat/FormatterTestLanguageParserConfiguration.java @@ -4,13 +4,7 @@ Generated with Xtext package org.eclipse.xtext.parsetree.formatter.parser.packrat; import org.eclipse.xtext.parser.packrat.AbstractParserConfiguration; -import org.eclipse.xtext.parser.packrat.ICharSequenceWithOffset; -import org.eclipse.xtext.parser.packrat.IHiddenTokenHandler; -import org.eclipse.xtext.parser.packrat.IMarkerFactory; -import org.eclipse.xtext.parser.packrat.consumers.IConsumerUtility; -import org.eclipse.xtext.parser.packrat.consumers.INonTerminalConsumer; import org.eclipse.xtext.parser.packrat.consumers.ITerminalConsumer; -import org.eclipse.xtext.parser.packrat.tokens.IParsedTokenAcceptor; import org.eclipse.xtext.builtin.parser.packrat.XtextBuiltinParserConfiguration; @@ -26,6 +20,7 @@ import org.eclipse.xtext.builtin.parser.packrat.consumers.XtextBuiltinSL_COMMENT import org.eclipse.xtext.builtin.parser.packrat.consumers.XtextBuiltinWSConsumer; import org.eclipse.xtext.builtin.parser.packrat.consumers.XtextBuiltinANY_OTHERConsumer; +@SuppressWarnings("unused") public class FormatterTestLanguageParserConfiguration extends AbstractParserConfiguration { private XtextBuiltinParserConfiguration xtextBuiltinConfiguration; @@ -35,11 +30,9 @@ public class FormatterTestLanguageParserConfiguration extends AbstractParserConf private FormatterTestLanguageTestLinewrapConsumer testLinewrapConsumer; private FormatterTestLanguageTestIndentationConsumer testIndentationConsumer; - public FormatterTestLanguageParserConfiguration(ICharSequenceWithOffset input, IMarkerFactory markerFactory, - IParsedTokenAcceptor tokenAcceptor, IHiddenTokenHandler hiddenTokenHandler, IConsumerUtility consumerUtil) { - super(input, markerFactory, tokenAcceptor, hiddenTokenHandler, consumerUtil); - this.xtextBuiltinConfiguration = new XtextBuiltinParserConfiguration( - input, markerFactory, tokenAcceptor, hiddenTokenHandler, consumerUtil); + public FormatterTestLanguageParserConfiguration(IInternalParserConfiguration configuration) { + super(configuration); + this.xtextBuiltinConfiguration = new XtextBuiltinParserConfiguration(configuration); } public FormatterTestLanguageRootConsumer getRootConsumer() { @@ -49,16 +42,16 @@ public class FormatterTestLanguageParserConfiguration extends AbstractParserConf public void createNonTerminalConsumers() { getXtextBuiltinConfiguration().createNonTerminalConsumers(); rootConsumer = new FormatterTestLanguageRootConsumer( - getInput(), getMarkerFactory(), getTokenAcceptor(), getHiddenTokenHandler(), getConsumerUtil(), null + this, null ); lineConsumer = new FormatterTestLanguageLineConsumer( - getInput(), getMarkerFactory(), getTokenAcceptor(), getHiddenTokenHandler(), getConsumerUtil(), null + this, null ); testLinewrapConsumer = new FormatterTestLanguageTestLinewrapConsumer( - getInput(), getMarkerFactory(), getTokenAcceptor(), getHiddenTokenHandler(), getConsumerUtil(), null + this, null ); testIndentationConsumer = new FormatterTestLanguageTestIndentationConsumer( - getInput(), getMarkerFactory(), getTokenAcceptor(), getHiddenTokenHandler(), getConsumerUtil(), null + this, null ); } diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/formatter/parser/packrat/consumers/FormatterTestLanguageLineConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/formatter/parser/packrat/consumers/FormatterTestLanguageLineConsumer.java index 2213fb3..fe070e1 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/formatter/parser/packrat/consumers/FormatterTestLanguageLineConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/formatter/parser/packrat/consumers/FormatterTestLanguageLineConsumer.java @@ -4,17 +4,13 @@ Generated with Xtext package org.eclipse.xtext.parsetree.formatter.parser.packrat.consumers; import org.eclipse.emf.ecore.EObject; -import org.eclipse.xtext.parser.packrat.ICharSequenceWithOffset; -import org.eclipse.xtext.parser.packrat.IHiddenTokenHandler; -import org.eclipse.xtext.parser.packrat.IMarkerFactory; 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.consumers.INonTerminalConsumerConfiguration; import org.eclipse.xtext.parser.packrat.consumers.ConsumeResult; 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.parsetree.formatter.services.FormatterTestLanguageGrammarAccess; import org.eclipse.xtext.parsetree.formatter.services.FormatterTestLanguageGrammarAccess.LineElements; @@ -32,10 +28,8 @@ public final class FormatterTestLanguageLineConsumer extends NonTerminalConsumer private ISequenceMatcher ruleCall$6$Delimiter; - public FormatterTestLanguageLineConsumer(ICharSequenceWithOffset input, IMarkerFactory markerFactory, - IParsedTokenAcceptor tokenAcceptor, IHiddenTokenHandler hiddenTokenHandler, IConsumerUtility consumerUtil, - ITerminalConsumer[] hiddenTokens) { - super(input, markerFactory, tokenAcceptor, hiddenTokenHandler, consumerUtil, hiddenTokens); + public FormatterTestLanguageLineConsumer(INonTerminalConsumerConfiguration configuration, ITerminalConsumer[] hiddenTokens) { + super(configuration, hiddenTokens); keyword$7$Delimiter = ICharacterClass.Factory.nullClass(); ruleCall$4$Delimiter = ISequenceMatcher.Factory.nullMatcher(); ruleCall$6$Delimiter = ISequenceMatcher.Factory.nullMatcher(); diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/formatter/parser/packrat/consumers/FormatterTestLanguageRootConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/formatter/parser/packrat/consumers/FormatterTestLanguageRootConsumer.java index 207c77a..b1c032d 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/formatter/parser/packrat/consumers/FormatterTestLanguageRootConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/formatter/parser/packrat/consumers/FormatterTestLanguageRootConsumer.java @@ -4,17 +4,13 @@ Generated with Xtext package org.eclipse.xtext.parsetree.formatter.parser.packrat.consumers; import org.eclipse.emf.ecore.EObject; -import org.eclipse.xtext.parser.packrat.ICharSequenceWithOffset; -import org.eclipse.xtext.parser.packrat.IHiddenTokenHandler; -import org.eclipse.xtext.parser.packrat.IMarkerFactory; 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.consumers.INonTerminalConsumerConfiguration; import org.eclipse.xtext.parser.packrat.consumers.ConsumeResult; 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.parsetree.formatter.services.FormatterTestLanguageGrammarAccess; import org.eclipse.xtext.parsetree.formatter.services.FormatterTestLanguageGrammarAccess.RootElements; @@ -30,10 +26,8 @@ public final class FormatterTestLanguageRootConsumer extends NonTerminalConsumer private ICharacterClass keyword$2$Delimiter; - public FormatterTestLanguageRootConsumer(ICharSequenceWithOffset input, IMarkerFactory markerFactory, - IParsedTokenAcceptor tokenAcceptor, IHiddenTokenHandler hiddenTokenHandler, IConsumerUtility consumerUtil, - ITerminalConsumer[] hiddenTokens) { - super(input, markerFactory, tokenAcceptor, hiddenTokenHandler, consumerUtil, hiddenTokens); + public FormatterTestLanguageRootConsumer(INonTerminalConsumerConfiguration configuration, ITerminalConsumer[] hiddenTokens) { + super(configuration, hiddenTokens); keyword$2$Delimiter = ICharacterClass.Factory.nullClass(); } diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/formatter/parser/packrat/consumers/FormatterTestLanguageTestIndentationConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/formatter/parser/packrat/consumers/FormatterTestLanguageTestIndentationConsumer.java index 022c3ae..175cbab 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/formatter/parser/packrat/consumers/FormatterTestLanguageTestIndentationConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/formatter/parser/packrat/consumers/FormatterTestLanguageTestIndentationConsumer.java @@ -4,17 +4,13 @@ Generated with Xtext package org.eclipse.xtext.parsetree.formatter.parser.packrat.consumers; import org.eclipse.emf.ecore.EObject; -import org.eclipse.xtext.parser.packrat.ICharSequenceWithOffset; -import org.eclipse.xtext.parser.packrat.IHiddenTokenHandler; -import org.eclipse.xtext.parser.packrat.IMarkerFactory; 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.consumers.INonTerminalConsumerConfiguration; import org.eclipse.xtext.parser.packrat.consumers.ConsumeResult; 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.parsetree.formatter.services.FormatterTestLanguageGrammarAccess; import org.eclipse.xtext.parsetree.formatter.services.FormatterTestLanguageGrammarAccess.TestIndentationElements; @@ -34,10 +30,8 @@ public final class FormatterTestLanguageTestIndentationConsumer extends NonTermi private ICharacterClass keyword$11$Delimiter; - public FormatterTestLanguageTestIndentationConsumer(ICharSequenceWithOffset input, IMarkerFactory markerFactory, - IParsedTokenAcceptor tokenAcceptor, IHiddenTokenHandler hiddenTokenHandler, IConsumerUtility consumerUtil, - ITerminalConsumer[] hiddenTokens) { - super(input, markerFactory, tokenAcceptor, hiddenTokenHandler, consumerUtil, hiddenTokens); + public FormatterTestLanguageTestIndentationConsumer(INonTerminalConsumerConfiguration configuration, ITerminalConsumer[] hiddenTokens) { + super(configuration, hiddenTokens); keyword$4$Delimiter = ICharacterClass.Factory.nullClass(); keyword$5$Delimiter = ICharacterClass.Factory.nullClass(); keyword$11$Delimiter = ICharacterClass.Factory.nullClass(); diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/formatter/parser/packrat/consumers/FormatterTestLanguageTestLinewrapConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/formatter/parser/packrat/consumers/FormatterTestLanguageTestLinewrapConsumer.java index 0e4ed6a..5e74fc7 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/formatter/parser/packrat/consumers/FormatterTestLanguageTestLinewrapConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/formatter/parser/packrat/consumers/FormatterTestLanguageTestLinewrapConsumer.java @@ -4,17 +4,13 @@ Generated with Xtext package org.eclipse.xtext.parsetree.formatter.parser.packrat.consumers; import org.eclipse.emf.ecore.EObject; -import org.eclipse.xtext.parser.packrat.ICharSequenceWithOffset; -import org.eclipse.xtext.parser.packrat.IHiddenTokenHandler; -import org.eclipse.xtext.parser.packrat.IMarkerFactory; 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.consumers.INonTerminalConsumerConfiguration; import org.eclipse.xtext.parser.packrat.consumers.ConsumeResult; 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.parsetree.formatter.services.FormatterTestLanguageGrammarAccess; import org.eclipse.xtext.parsetree.formatter.services.FormatterTestLanguageGrammarAccess.TestLinewrapElements; @@ -28,10 +24,8 @@ public final class FormatterTestLanguageTestLinewrapConsumer extends NonTerminal private ICharacterClass keyword$2$Delimiter; - public FormatterTestLanguageTestLinewrapConsumer(ICharSequenceWithOffset input, IMarkerFactory markerFactory, - IParsedTokenAcceptor tokenAcceptor, IHiddenTokenHandler hiddenTokenHandler, IConsumerUtility consumerUtil, - ITerminalConsumer[] hiddenTokens) { - super(input, markerFactory, tokenAcceptor, hiddenTokenHandler, consumerUtil, hiddenTokens); + public FormatterTestLanguageTestLinewrapConsumer(INonTerminalConsumerConfiguration configuration, ITerminalConsumer[] hiddenTokens) { + super(configuration, hiddenTokens); keyword$2$Delimiter = ICharacterClass.Factory.nullClass(); } diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/packrat/ComplexReconstrTestLanguagePackratParser.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/packrat/ComplexReconstrTestLanguagePackratParser.java index dcace22..cc5ada3 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/packrat/ComplexReconstrTestLanguagePackratParser.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/packrat/ComplexReconstrTestLanguagePackratParser.java @@ -4,19 +4,13 @@ Generated with Xtext package org.eclipse.xtext.parsetree.reconstr.parser.packrat; import org.eclipse.xtext.parser.packrat.AbstractPackratParser; -import org.eclipse.xtext.parser.packrat.ICharSequenceWithOffset; -import org.eclipse.xtext.parser.packrat.IHiddenTokenHandler; -import org.eclipse.xtext.parser.packrat.IMarkerFactory; -import org.eclipse.xtext.parser.packrat.consumers.IConsumerUtility; -import org.eclipse.xtext.parser.packrat.tokens.IParsedTokenAcceptor; +import org.eclipse.xtext.parser.packrat.AbstractParserConfiguration.IInternalParserConfiguration; public class ComplexReconstrTestLanguagePackratParser extends AbstractPackratParser { @Override - protected ComplexReconstrTestLanguageParserConfiguration createParserConfiguration(ICharSequenceWithOffset input, - IMarkerFactory markerFactory, IParsedTokenAcceptor tokenAcceptor, IHiddenTokenHandler hiddenTokenHandler, - IConsumerUtility consumerUtil) { - return new ComplexReconstrTestLanguageParserConfiguration(input, markerFactory, tokenAcceptor, hiddenTokenHandler, consumerUtil); + protected ComplexReconstrTestLanguageParserConfiguration createParserConfiguration(IInternalParserConfiguration configuration) { + return new ComplexReconstrTestLanguageParserConfiguration(configuration); } } diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/packrat/ComplexReconstrTestLanguageParserConfiguration.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/packrat/ComplexReconstrTestLanguageParserConfiguration.java index bf294ed..7865037 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/packrat/ComplexReconstrTestLanguageParserConfiguration.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/packrat/ComplexReconstrTestLanguageParserConfiguration.java @@ -4,13 +4,7 @@ Generated with Xtext package org.eclipse.xtext.parsetree.reconstr.parser.packrat; import org.eclipse.xtext.parser.packrat.AbstractParserConfiguration; -import org.eclipse.xtext.parser.packrat.ICharSequenceWithOffset; -import org.eclipse.xtext.parser.packrat.IHiddenTokenHandler; -import org.eclipse.xtext.parser.packrat.IMarkerFactory; -import org.eclipse.xtext.parser.packrat.consumers.IConsumerUtility; -import org.eclipse.xtext.parser.packrat.consumers.INonTerminalConsumer; import org.eclipse.xtext.parser.packrat.consumers.ITerminalConsumer; -import org.eclipse.xtext.parser.packrat.tokens.IParsedTokenAcceptor; import org.eclipse.xtext.builtin.parser.packrat.XtextBuiltinParserConfiguration; @@ -37,6 +31,7 @@ import org.eclipse.xtext.builtin.parser.packrat.consumers.XtextBuiltinSL_COMMENT import org.eclipse.xtext.builtin.parser.packrat.consumers.XtextBuiltinWSConsumer; import org.eclipse.xtext.builtin.parser.packrat.consumers.XtextBuiltinANY_OTHERConsumer; +@SuppressWarnings("unused") public class ComplexReconstrTestLanguageParserConfiguration extends AbstractParserConfiguration { private XtextBuiltinParserConfiguration xtextBuiltinConfiguration; @@ -57,11 +52,9 @@ public class ComplexReconstrTestLanguageParserConfiguration extends AbstractPars private ComplexReconstrTestLanguageTrickyG1Consumer trickyG1Consumer; private ComplexReconstrTestLanguageTrickyG2Consumer trickyG2Consumer; - public ComplexReconstrTestLanguageParserConfiguration(ICharSequenceWithOffset input, IMarkerFactory markerFactory, - IParsedTokenAcceptor tokenAcceptor, IHiddenTokenHandler hiddenTokenHandler, IConsumerUtility consumerUtil) { - super(input, markerFactory, tokenAcceptor, hiddenTokenHandler, consumerUtil); - this.xtextBuiltinConfiguration = new XtextBuiltinParserConfiguration( - input, markerFactory, tokenAcceptor, hiddenTokenHandler, consumerUtil); + public ComplexReconstrTestLanguageParserConfiguration(IInternalParserConfiguration configuration) { + super(configuration); + this.xtextBuiltinConfiguration = new XtextBuiltinParserConfiguration(configuration); } public ComplexReconstrTestLanguageRootConsumer getRootConsumer() { @@ -71,49 +64,49 @@ public class ComplexReconstrTestLanguageParserConfiguration extends AbstractPars public void createNonTerminalConsumers() { getXtextBuiltinConfiguration().createNonTerminalConsumers(); rootConsumer = new ComplexReconstrTestLanguageRootConsumer( - getInput(), getMarkerFactory(), getTokenAcceptor(), getHiddenTokenHandler(), getConsumerUtil(), null + this, null ); opConsumer = new ComplexReconstrTestLanguageOpConsumer( - getInput(), getMarkerFactory(), getTokenAcceptor(), getHiddenTokenHandler(), getConsumerUtil(), null + this, null ); termConsumer = new ComplexReconstrTestLanguageTermConsumer( - getInput(), getMarkerFactory(), getTokenAcceptor(), getHiddenTokenHandler(), getConsumerUtil(), null + this, null ); atomConsumer = new ComplexReconstrTestLanguageAtomConsumer( - getInput(), getMarkerFactory(), getTokenAcceptor(), getHiddenTokenHandler(), getConsumerUtil(), null + this, null ); parensConsumer = new ComplexReconstrTestLanguageParensConsumer( - getInput(), getMarkerFactory(), getTokenAcceptor(), getHiddenTokenHandler(), getConsumerUtil(), null + this, null ); trickyAConsumer = new ComplexReconstrTestLanguageTrickyAConsumer( - getInput(), getMarkerFactory(), getTokenAcceptor(), getHiddenTokenHandler(), getConsumerUtil(), null + this, null ); trickyA1Consumer = new ComplexReconstrTestLanguageTrickyA1Consumer( - getInput(), getMarkerFactory(), getTokenAcceptor(), getHiddenTokenHandler(), getConsumerUtil(), null + this, null ); trickyBConsumer = new ComplexReconstrTestLanguageTrickyBConsumer( - getInput(), getMarkerFactory(), getTokenAcceptor(), getHiddenTokenHandler(), getConsumerUtil(), null + this, null ); trickyCConsumer = new ComplexReconstrTestLanguageTrickyCConsumer( - getInput(), getMarkerFactory(), getTokenAcceptor(), getHiddenTokenHandler(), getConsumerUtil(), null + this, null ); trickyDConsumer = new ComplexReconstrTestLanguageTrickyDConsumer( - getInput(), getMarkerFactory(), getTokenAcceptor(), getHiddenTokenHandler(), getConsumerUtil(), null + this, null ); trickyEConsumer = new ComplexReconstrTestLanguageTrickyEConsumer( - getInput(), getMarkerFactory(), getTokenAcceptor(), getHiddenTokenHandler(), getConsumerUtil(), null + this, null ); trickyFConsumer = new ComplexReconstrTestLanguageTrickyFConsumer( - getInput(), getMarkerFactory(), getTokenAcceptor(), getHiddenTokenHandler(), getConsumerUtil(), null + this, null ); trickyGConsumer = new ComplexReconstrTestLanguageTrickyGConsumer( - getInput(), getMarkerFactory(), getTokenAcceptor(), getHiddenTokenHandler(), getConsumerUtil(), null + this, null ); trickyG1Consumer = new ComplexReconstrTestLanguageTrickyG1Consumer( - getInput(), getMarkerFactory(), getTokenAcceptor(), getHiddenTokenHandler(), getConsumerUtil(), null + this, null ); trickyG2Consumer = new ComplexReconstrTestLanguageTrickyG2Consumer( - getInput(), getMarkerFactory(), getTokenAcceptor(), getHiddenTokenHandler(), getConsumerUtil(), null + this, null ); } diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/packrat/SimpleReconstrTestLanguagePackratParser.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/packrat/SimpleReconstrTestLanguagePackratParser.java index 1dfdda1..8cd515d 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/packrat/SimpleReconstrTestLanguagePackratParser.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/packrat/SimpleReconstrTestLanguagePackratParser.java @@ -4,19 +4,13 @@ Generated with Xtext package org.eclipse.xtext.parsetree.reconstr.parser.packrat; import org.eclipse.xtext.parser.packrat.AbstractPackratParser; -import org.eclipse.xtext.parser.packrat.ICharSequenceWithOffset; -import org.eclipse.xtext.parser.packrat.IHiddenTokenHandler; -import org.eclipse.xtext.parser.packrat.IMarkerFactory; -import org.eclipse.xtext.parser.packrat.consumers.IConsumerUtility; -import org.eclipse.xtext.parser.packrat.tokens.IParsedTokenAcceptor; +import org.eclipse.xtext.parser.packrat.AbstractParserConfiguration.IInternalParserConfiguration; public class SimpleReconstrTestLanguagePackratParser extends AbstractPackratParser { @Override - protected SimpleReconstrTestLanguageParserConfiguration createParserConfiguration(ICharSequenceWithOffset input, - IMarkerFactory markerFactory, IParsedTokenAcceptor tokenAcceptor, IHiddenTokenHandler hiddenTokenHandler, - IConsumerUtility consumerUtil) { - return new SimpleReconstrTestLanguageParserConfiguration(input, markerFactory, tokenAcceptor, hidde |