| author | szarnekow | 2009-02-19 18:31:07 (EST) |
|---|---|---|
| committer | sefftinge | 2009-02-19 18:31:07 (EST) |
| commit | 02fb0775f15acbc3371439c9f62619dbc3dba385 (patch) (side-by-side diff) | |
| tree | 84401a2da9bac459093b6842adffb30f6e5ccb70 | |
| parent | 8418fbeb71f392cd7b38d4cc100b7b78f4771cad (diff) | |
| download | org.eclipse.xtext-02fb0775f15acbc3371439c9f62619dbc3dba385.zip org.eclipse.xtext-02fb0775f15acbc3371439c9f62619dbc3dba385.tar.gz org.eclipse.xtext-02fb0775f15acbc3371439c9f62619dbc3dba385.tar.bz2 | |
Fix: Suppress cvs-IDs in generated emf java files
Removed some unused methods
Preparations for backtracking in packrat parser
Removed some logging noise in ecoreGeneratorFragment
1295 files changed, 9149 insertions, 14467 deletions
diff --git a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/ReferenceGrammar.genmodel b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/ReferenceGrammar.genmodel index 1f2c6e3..d6e8d97 100644 --- a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/ReferenceGrammar.genmodel +++ b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/ReferenceGrammar.genmodel @@ -1,74 +1,74 @@ <?xml version="1.0" encoding="ASCII"?> <genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="../org.eclipse.xtext.reference/src-gen" forceOverwrite="true" bundleManifest="false" complianceLevel="5.0" copyrightFields="false"> <genPackages prefix="ReferenceGrammar" basePackage="org.eclipse.xtext.reference" disposableProviderFactory="true"> - <ecorePackage href="file:/Users/svenefftinge/Documents/workspace/ws-oAW5/develop/../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/ReferenceGrammar.ecore#/"/> + <ecorePackage href="file:/Users/zarnekow/EclipseWorkspaces/3.5M5/develop/../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/ReferenceGrammar.ecore#/"/> <genClasses> - <ecoreClass href="file:/Users/svenefftinge/Documents/workspace/ws-oAW5/develop/../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/ReferenceGrammar.ecore#//Spielplatz"/> + <ecoreClass href="file:/Users/zarnekow/EclipseWorkspaces/3.5M5/develop/../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/ReferenceGrammar.ecore#//Spielplatz"/> <genFeatures createChild="false"> - <ecoreFeature xsi:type="ecore:EAttribute" href="file:/Users/svenefftinge/Documents/workspace/ws-oAW5/develop/../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/ReferenceGrammar.ecore#//Spielplatz/groesse"/> + <ecoreFeature xsi:type="ecore:EAttribute" href="file:/Users/zarnekow/EclipseWorkspaces/3.5M5/develop/../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/ReferenceGrammar.ecore#//Spielplatz/groesse"/> </genFeatures> <genFeatures createChild="false"> - <ecoreFeature xsi:type="ecore:EAttribute" href="file:/Users/svenefftinge/Documents/workspace/ws-oAW5/develop/../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/ReferenceGrammar.ecore#//Spielplatz/beschreibung"/> + <ecoreFeature xsi:type="ecore:EAttribute" href="file:/Users/zarnekow/EclipseWorkspaces/3.5M5/develop/../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/ReferenceGrammar.ecore#//Spielplatz/beschreibung"/> </genFeatures> <genFeatures property="None" children="true" createChild="true"> - <ecoreFeature xsi:type="ecore:EReference" href="file:/Users/svenefftinge/Documents/workspace/ws-oAW5/develop/../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/ReferenceGrammar.ecore#//Spielplatz/kinder"/> + <ecoreFeature xsi:type="ecore:EReference" href="file:/Users/zarnekow/EclipseWorkspaces/3.5M5/develop/../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/ReferenceGrammar.ecore#//Spielplatz/kinder"/> </genFeatures> <genFeatures property="None" children="true" createChild="true"> - <ecoreFeature xsi:type="ecore:EReference" href="file:/Users/svenefftinge/Documents/workspace/ws-oAW5/develop/../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/ReferenceGrammar.ecore#//Spielplatz/erzieher"/> + <ecoreFeature xsi:type="ecore:EReference" href="file:/Users/zarnekow/EclipseWorkspaces/3.5M5/develop/../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/ReferenceGrammar.ecore#//Spielplatz/erzieher"/> </genFeatures> <genFeatures property="None" children="true" createChild="true"> - <ecoreFeature xsi:type="ecore:EReference" href="file:/Users/svenefftinge/Documents/workspace/ws-oAW5/develop/../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/ReferenceGrammar.ecore#//Spielplatz/spielzeuge"/> + <ecoreFeature xsi:type="ecore:EReference" href="file:/Users/zarnekow/EclipseWorkspaces/3.5M5/develop/../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/ReferenceGrammar.ecore#//Spielplatz/spielzeuge"/> </genFeatures> <genFeatures property="None" children="true" createChild="true"> - <ecoreFeature xsi:type="ecore:EReference" href="file:/Users/svenefftinge/Documents/workspace/ws-oAW5/develop/../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/ReferenceGrammar.ecore#//Spielplatz/familie"/> + <ecoreFeature xsi:type="ecore:EReference" href="file:/Users/zarnekow/EclipseWorkspaces/3.5M5/develop/../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/ReferenceGrammar.ecore#//Spielplatz/familie"/> </genFeatures> <genFeatures property="None" children="true" createChild="true"> - <ecoreFeature xsi:type="ecore:EReference" href="file:/Users/svenefftinge/Documents/workspace/ws-oAW5/develop/../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/ReferenceGrammar.ecore#//Spielplatz/types"/> + <ecoreFeature xsi:type="ecore:EReference" href="file:/Users/zarnekow/EclipseWorkspaces/3.5M5/develop/../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/ReferenceGrammar.ecore#//Spielplatz/types"/> </genFeatures> </genClasses> <genClasses> - <ecoreClass href="file:/Users/svenefftinge/Documents/workspace/ws-oAW5/develop/../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/ReferenceGrammar.ecore#//Person"/> + <ecoreClass href="file:/Users/zarnekow/EclipseWorkspaces/3.5M5/develop/../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/ReferenceGrammar.ecore#//Person"/> <genFeatures createChild="false"> - <ecoreFeature xsi:type="ecore:EAttribute" href="file:/Users/svenefftinge/Documents/workspace/ws-oAW5/develop/../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/ReferenceGrammar.ecore#//Person/name"/> + <ecoreFeature xsi:type="ecore:EAttribute" href="file:/Users/zarnekow/EclipseWorkspaces/3.5M5/develop/../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/ReferenceGrammar.ecore#//Person/name"/> </genFeatures> <genFeatures createChild="false"> - <ecoreFeature xsi:type="ecore:EAttribute" href="file:/Users/svenefftinge/Documents/workspace/ws-oAW5/develop/../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/ReferenceGrammar.ecore#//Person/age"/> + <ecoreFeature xsi:type="ecore:EAttribute" href="file:/Users/zarnekow/EclipseWorkspaces/3.5M5/develop/../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/ReferenceGrammar.ecore#//Person/age"/> </genFeatures> </genClasses> <genClasses> - <ecoreClass href="file:/Users/svenefftinge/Documents/workspace/ws-oAW5/develop/../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/ReferenceGrammar.ecore#//Kind"/> + <ecoreClass href="file:/Users/zarnekow/EclipseWorkspaces/3.5M5/develop/../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/ReferenceGrammar.ecore#//Kind"/> </genClasses> <genClasses> - <ecoreClass href="file:/Users/svenefftinge/Documents/workspace/ws-oAW5/develop/../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/ReferenceGrammar.ecore#//Erwachsener"/> + <ecoreClass href="file:/Users/zarnekow/EclipseWorkspaces/3.5M5/develop/../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/ReferenceGrammar.ecore#//Erwachsener"/> </genClasses> <genClasses> - <ecoreClass href="file:/Users/svenefftinge/Documents/workspace/ws-oAW5/develop/../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/ReferenceGrammar.ecore#//Spielzeug"/> + <ecoreClass href="file:/Users/zarnekow/EclipseWorkspaces/3.5M5/develop/../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/ReferenceGrammar.ecore#//Spielzeug"/> <genFeatures createChild="false"> - <ecoreFeature xsi:type="ecore:EAttribute" href="file:/Users/svenefftinge/Documents/workspace/ws-oAW5/develop/../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/ReferenceGrammar.ecore#//Spielzeug/name"/> + <ecoreFeature xsi:type="ecore:EAttribute" href="file:/Users/zarnekow/EclipseWorkspaces/3.5M5/develop/../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/ReferenceGrammar.ecore#//Spielzeug/name"/> </genFeatures> <genFeatures property="None" children="true" createChild="true"> - <ecoreFeature xsi:type="ecore:EReference" href="file:/Users/svenefftinge/Documents/workspace/ws-oAW5/develop/../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/ReferenceGrammar.ecore#//Spielzeug/farbe"/> + <ecoreFeature xsi:type="ecore:EReference" href="file:/Users/zarnekow/EclipseWorkspaces/3.5M5/develop/../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/ReferenceGrammar.ecore#//Spielzeug/farbe"/> </genFeatures> </genClasses> <genClasses> - <ecoreClass href="file:/Users/svenefftinge/Documents/workspace/ws-oAW5/develop/../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/ReferenceGrammar.ecore#//Familie"/> + <ecoreClass href="file:/Users/zarnekow/EclipseWorkspaces/3.5M5/develop/../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/ReferenceGrammar.ecore#//Familie"/> <genFeatures createChild="false"> - <ecoreFeature xsi:type="ecore:EAttribute" href="file:/Users/svenefftinge/Documents/workspace/ws-oAW5/develop/../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/ReferenceGrammar.ecore#//Familie/name"/> + <ecoreFeature xsi:type="ecore:EAttribute" href="file:/Users/zarnekow/EclipseWorkspaces/3.5M5/develop/../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/ReferenceGrammar.ecore#//Familie/name"/> </genFeatures> <genFeatures notify="false" createChild="false" propertySortChoices="true"> - <ecoreFeature xsi:type="ecore:EReference" href="file:/Users/svenefftinge/Documents/workspace/ws-oAW5/develop/../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/ReferenceGrammar.ecore#//Familie/mutter"/> + <ecoreFeature xsi:type="ecore:EReference" href="file:/Users/zarnekow/EclipseWorkspaces/3.5M5/develop/../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/ReferenceGrammar.ecore#//Familie/mutter"/> </genFeatures> <genFeatures notify="false" createChild="false" propertySortChoices="true"> - <ecoreFeature xsi:type="ecore:EReference" href="file:/Users/svenefftinge/Documents/workspace/ws-oAW5/develop/../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/ReferenceGrammar.ecore#//Familie/vater"/> + <ecoreFeature xsi:type="ecore:EReference" href="file:/Users/zarnekow/EclipseWorkspaces/3.5M5/develop/../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/ReferenceGrammar.ecore#//Familie/vater"/> </genFeatures> <genFeatures notify="false" createChild="false" propertySortChoices="true"> - <ecoreFeature xsi:type="ecore:EReference" href="file:/Users/svenefftinge/Documents/workspace/ws-oAW5/develop/../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/ReferenceGrammar.ecore#//Familie/kinder"/> + <ecoreFeature xsi:type="ecore:EReference" href="file:/Users/zarnekow/EclipseWorkspaces/3.5M5/develop/../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/ReferenceGrammar.ecore#//Familie/kinder"/> </genFeatures> </genClasses> <genClasses> - <ecoreClass href="file:/Users/svenefftinge/Documents/workspace/ws-oAW5/develop/../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/ReferenceGrammar.ecore#//Farbe"/> + <ecoreClass href="file:/Users/zarnekow/EclipseWorkspaces/3.5M5/develop/../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/ReferenceGrammar.ecore#//Farbe"/> <genFeatures createChild="false"> - <ecoreFeature xsi:type="ecore:EAttribute" href="file:/Users/svenefftinge/Documents/workspace/ws-oAW5/develop/../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/ReferenceGrammar.ecore#//Farbe/wert"/> + <ecoreFeature xsi:type="ecore:EAttribute" href="file:/Users/zarnekow/EclipseWorkspaces/3.5M5/develop/../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/ReferenceGrammar.ecore#//Farbe/wert"/> </genFeatures> </genClasses> </genPackages> 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 4ef5efa..4e4408f 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 @@ -44,34 +44,26 @@ public final class ReferenceGrammarCustomTypeParserRuleConsumer extends NonTermi } protected int consumeGroup$1(int entryPoint) throws Exception { - announceNextLevel(); - final IMarker marker = mark(); - int result = ConsumeResult.SUCCESS; + GroupResult result = createGroupResult(getRule().eleGroup()); switch(entryPoint) { case -1: // use fall through semantics of switch case - result = ConsumeResult.EMPTY_MATCH; + result.reset(); case 0: - announceNextStep(); - result = consumeKeyword$2(nextEntryPoint()); - if (result!=ConsumeResult.SUCCESS) { + result.nextStep(); + if (result.didGroupFail(consumeKeyword$2(nextEntryPoint()))) { + // TODO improve error message error("Another token expected.", getRule().ele0KeywordType()); - marker.commit(); - announceLevelFinished(); - return result; + return result.getResult(); } case 1: - announceNextStep(); - result = consumeAssignment$3(nextEntryPoint()); - if (result!=ConsumeResult.SUCCESS) { + result.nextStep(); + if (result.didGroupFail(consumeAssignment$3(nextEntryPoint()))) { + // TODO improve error message error("Another token expected.", getRule().ele1AssignmentName()); - marker.commit(); - announceLevelFinished(); - return result; + return result.getResult(); } } - marker.commit(); - announceLevelFinished(); - return result; + return result.getResult(); } protected int consumeKeyword$2(int entryPoint) throws Exception { 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 d0b981c..9a32d42 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 @@ -55,61 +55,47 @@ public final class ReferenceGrammarErwachsenerConsumer extends NonTerminalConsum } protected int consumeGroup$1(int entryPoint) throws Exception { - announceNextLevel(); - final IMarker marker = mark(); - int result = ConsumeResult.SUCCESS; + GroupResult result = createGroupResult(getRule().eleGroup()); switch(entryPoint) { case -1: // use fall through semantics of switch case - result = ConsumeResult.EMPTY_MATCH; + result.reset(); case 0: - announceNextStep(); - result = consumeKeyword$5(nextEntryPoint()); - if (result!=ConsumeResult.SUCCESS) { + result.nextStep(); + if (result.didGroupFail(consumeKeyword$5(nextEntryPoint()))) { + // TODO improve error message error("Another token expected.", getRule().ele0000KeywordErwachsener()); - marker.commit(); - announceLevelFinished(); - return result; + return result.getResult(); } case 1: - announceNextStep(); - result = consumeKeyword$6(nextEntryPoint()); - if (result!=ConsumeResult.SUCCESS) { + result.nextStep(); + if (result.didGroupFail(consumeKeyword$6(nextEntryPoint()))) { + // TODO improve error message error("Another token expected.", getRule().ele0001KeywordLeftParenthesis()); - marker.commit(); - announceLevelFinished(); - return result; + return result.getResult(); } case 2: - announceNextStep(); - result = consumeAssignment$7(nextEntryPoint()); - if (result!=ConsumeResult.SUCCESS) { + result.nextStep(); + if (result.didGroupFail(consumeAssignment$7(nextEntryPoint()))) { + // TODO improve error message error("Another token expected.", getRule().ele001AssignmentName()); - marker.commit(); - announceLevelFinished(); - return result; + return result.getResult(); } case 3: - announceNextStep(); - result = consumeAssignment$9(nextEntryPoint()); - if (result!=ConsumeResult.SUCCESS) { + result.nextStep(); + if (result.didGroupFail(consumeAssignment$9(nextEntryPoint()))) { + // TODO improve error message error("Another token expected.", getRule().ele01AssignmentAge()); - marker.commit(); - announceLevelFinished(); - return result; + return result.getResult(); } case 4: - announceNextStep(); - result = consumeKeyword$11(nextEntryPoint()); - if (result!=ConsumeResult.SUCCESS) { + result.nextStep(); + if (result.didGroupFail(consumeKeyword$11(nextEntryPoint()))) { + // TODO improve error message error("Another token expected.", getRule().ele1KeywordRightParenthesis()); - marker.commit(); - announceLevelFinished(); - return result; + return result.getResult(); } } - marker.commit(); - announceLevelFinished(); - return result; + return result.getResult(); } protected int consumeKeyword$5(int entryPoint) throws Exception { 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 2237553..aefec6f 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 @@ -73,88 +73,68 @@ public final class ReferenceGrammarFamilieConsumer extends NonTerminalConsumer { } protected int consumeGroup$1(int entryPoint) throws Exception { - announceNextLevel(); - final IMarker marker = mark(); - int result = ConsumeResult.SUCCESS; + GroupResult result = createGroupResult(getRule().eleGroup()); switch(entryPoint) { case -1: // use fall through semantics of switch case - result = ConsumeResult.EMPTY_MATCH; + result.reset(); case 0: - announceNextStep(); - result = consumeKeyword$8(nextEntryPoint()); - if (result!=ConsumeResult.SUCCESS) { + result.nextStep(); + if (result.didGroupFail(consumeKeyword$8(nextEntryPoint()))) { + // TODO improve error message error("Another token expected.", getRule().ele0000000KeywordFamilie()); - marker.commit(); - announceLevelFinished(); - return result; + return result.getResult(); } case 1: - announceNextStep(); - result = consumeKeyword$9(nextEntryPoint()); - if (result!=ConsumeResult.SUCCESS) { + result.nextStep(); + if (result.didGroupFail(consumeKeyword$9(nextEntryPoint()))) { + // TODO improve error message error("Another token expected.", getRule().ele0000001KeywordLeftParenthesis()); - marker.commit(); - announceLevelFinished(); - return result; + return result.getResult(); } case 2: - announceNextStep(); - result = consumeAssignment$10(nextEntryPoint()); - if (result!=ConsumeResult.SUCCESS) { + result.nextStep(); + if (result.didGroupFail(consumeAssignment$10(nextEntryPoint()))) { + // TODO improve error message error("Another token expected.", getRule().ele000001AssignmentName()); - marker.commit(); - announceLevelFinished(); - return result; + return result.getResult(); } case 3: - announceNextStep(); - result = consumeAssignment$16(nextEntryPoint()); - if (result!=ConsumeResult.SUCCESS) { + result.nextStep(); + if (result.didGroupFail(consumeAssignment$16(nextEntryPoint()))) { + // TODO improve error message error("Another token expected.", getRule().ele00001AssignmentMutter()); - marker.commit(); - announceLevelFinished(); - return result; + return result.getResult(); } case 4: - announceNextStep(); - result = consumeAssignment$19(nextEntryPoint()); - if (result!=ConsumeResult.SUCCESS) { + result.nextStep(); + if (result.didGroupFail(consumeAssignment$19(nextEntryPoint()))) { + // TODO improve error message error("Another token expected.", getRule().ele0001AssignmentVater()); - marker.commit(); - announceLevelFinished(); - return result; + return result.getResult(); } case 5: - announceNextStep(); - result = consumeAssignment$22(nextEntryPoint()); - if (result!=ConsumeResult.SUCCESS) { + result.nextStep(); + if (result.didGroupFail(consumeAssignment$22(nextEntryPoint()))) { + // TODO improve error message error("Another token expected.", getRule().ele001AssignmentKinder()); - marker.commit(); - announceLevelFinished(); - return result; + return result.getResult(); } case 6: - announceNextStep(); - result = consumeGroup$25(nextEntryPoint()); - if (result!=ConsumeResult.SUCCESS) { + result.nextStep(); + if (result.didGroupFail(consumeGroup$25(nextEntryPoint()))) { + // TODO improve error message error("Another token expected.", getRule().ele01Group()); - marker.commit(); - announceLevelFinished(); - return result; + return result.getResult(); } case 7: - announceNextStep(); - result = consumeKeyword$30(nextEntryPoint()); - if (result!=ConsumeResult.SUCCESS) { + result.nextStep(); + if (result.didGroupFail(consumeKeyword$30(nextEntryPoint()))) { + // TODO improve error message error("Another token expected.", getRule().ele1KeywordRightParenthesis()); - marker.commit(); - announceLevelFinished(); - return result; + return result.getResult(); } } - marker.commit(); - announceLevelFinished(); - return result; + return result.getResult(); } protected int consumeKeyword$8(int entryPoint) throws Exception { @@ -235,38 +215,31 @@ public final class ReferenceGrammarFamilieConsumer extends NonTerminalConsumer { marker.flush(); } marker.rollback(); + skipped(getRule().ele01Group()); return ConsumeResult.SUCCESS; } protected int doConsumeGroup$25(int entryPoint) throws Exception { - announceNextLevel(); - final IMarker marker = mark(); - int result = ConsumeResult.SUCCESS; + GroupResult result = createGroupResult(getRule().ele01Group()); switch(entryPoint) { case -1: // use fall through semantics of switch case - result = ConsumeResult.EMPTY_MATCH; + result.reset(); case 0: - announceNextStep(); - result = consumeKeyword$26(nextEntryPoint()); - if (result!=ConsumeResult.SUCCESS) { + result.nextStep(); + if (result.didGroupFail(consumeKeyword$26(nextEntryPoint()))) { + // TODO improve error message error("Another token expected.", getRule().ele010KeywordComma()); - marker.commit(); - announceLevelFinished(); - return result; + return result.getResult(); } case 1: - announceNextStep(); - result = consumeAssignment$27(nextEntryPoint()); - if (result!=ConsumeResult.SUCCESS) { + result.nextStep(); + if (result.didGroupFail(consumeAssignment$27(nextEntryPoint()))) { + // TODO improve error message error("Another token expected.", getRule().ele011AssignmentKinder()); - marker.commit(); - announceLevelFinished(); - return result; + return result.getResult(); } } - marker.commit(); - announceLevelFinished(); - return result; + return result.getResult(); } protected int consumeKeyword$26(int entryPoint) throws Exception { 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 e7a672d..7c6b244 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 @@ -55,61 +55,47 @@ public final class ReferenceGrammarKindConsumer extends NonTerminalConsumer { } protected int consumeGroup$1(int entryPoint) throws Exception { - announceNextLevel(); - final IMarker marker = mark(); - int result = ConsumeResult.SUCCESS; + GroupResult result = createGroupResult(getRule().eleGroup()); switch(entryPoint) { case -1: // use fall through semantics of switch case - result = ConsumeResult.EMPTY_MATCH; + result.reset(); case 0: - announceNextStep(); - result = consumeKeyword$5(nextEntryPoint()); - if (result!=ConsumeResult.SUCCESS) { + result.nextStep(); + if (result.didGroupFail(consumeKeyword$5(nextEntryPoint()))) { + // TODO improve error message error("Another token expected.", getRule().ele0000KeywordKind()); - marker.commit(); - announceLevelFinished(); - return result; + return result.getResult(); } case 1: - announceNextStep(); - result = consumeKeyword$6(nextEntryPoint()); - if (result!=ConsumeResult.SUCCESS) { + result.nextStep(); + if (result.didGroupFail(consumeKeyword$6(nextEntryPoint()))) { + // TODO improve error message error("Another token expected.", getRule().ele0001KeywordLeftParenthesis()); - marker.commit(); - announceLevelFinished(); - return result; + return result.getResult(); } case 2: - announceNextStep(); - result = consumeAssignment$7(nextEntryPoint()); - if (result!=ConsumeResult.SUCCESS) { + result.nextStep(); + if (result.didGroupFail(consumeAssignment$7(nextEntryPoint()))) { + // TODO improve error message error("Another token expected.", getRule().ele001AssignmentName()); - marker.commit(); - announceLevelFinished(); - return result; + return result.getResult(); } case 3: - announceNextStep(); - result = consumeAssignment$9(nextEntryPoint()); - if (result!=ConsumeResult.SUCCESS) { + result.nextStep(); + if (result.didGroupFail(consumeAssignment$9(nextEntryPoint()))) { + // TODO improve error message error("Another token expected.", getRule().ele01AssignmentAge()); - marker.commit(); - announceLevelFinished(); - return result; + return result.getResult(); } case 4: - announceNextStep(); - result = consumeKeyword$11(nextEntryPoint()); - if (result!=ConsumeResult.SUCCESS) { + result.nextStep(); + if (result.didGroupFail(consumeKeyword$11(nextEntryPoint()))) { + // TODO improve error message error("Another token expected.", getRule().ele1KeywordRightParenthesis()); - marker.commit(); - announceLevelFinished(); - return result; + return result.getResult(); } } - marker.commit(); - announceLevelFinished(); - return result; + return result.getResult(); } protected int consumeKeyword$5(int entryPoint) throws Exception { 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 45d98a5..79a10ab 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 @@ -40,7 +40,7 @@ public final class ReferenceGrammarPersonConsumer extends NonTerminalConsumer { } protected int consumeAlternatives$1(int entryPoint) throws Exception { - AlternativesResult result = createAlternativesResult(); + AlternativesResult result = createAlternativesResult(getRule().eleAlternatives()); switch(entryPoint) { case -1: // use fall through semantics of switch case result.reset(); 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 07487ca..4bd1fb4 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 @@ -67,78 +67,63 @@ public final class ReferenceGrammarSpielplatzConsumer extends NonTerminalConsume protected int consumeGroup$1(int entryPoint) throws Exception { IMarker marker = mark(); int result = doConsumeGroup$1(entryPoint); - if (result != ConsumeResult.SUCCESS) + if (result != ConsumeResult.SUCCESS) { marker.rollback(); - else + skipped(getRule().eleGroup()); + } else marker.commit(); return ConsumeResult.SUCCESS; } protected int doConsumeGroup$1(int entryPoint) throws Exception { - announceNextLevel(); - final IMarker marker = mark(); - int result = ConsumeResult.SUCCESS; + GroupResult result = createGroupResult(getRule().eleGroup()); switch(entryPoint) { case -1: // use fall through semantics of switch case - result = ConsumeResult.EMPTY_MATCH; + result.reset(); case 0: - announceNextStep(); - result = consumeKeyword$6(nextEntryPoint()); - if (result!=ConsumeResult.SUCCESS) { + result.nextStep(); + if (result.didGroupFail(consumeKeyword$6(nextEntryPoint()))) { + // TODO improve error message error("Another token expected.", getRule().ele00000KeywordSpielplatz()); - marker.commit(); - announceLevelFinished(); - return result; + return result.getResult(); } case 1: - announceNextStep(); - result = consumeAssignment$7(nextEntryPoint()); - if (result!=ConsumeResult.SUCCESS) { + result.nextStep(); + if (result.didGroupFail(consumeAssignment$7(nextEntryPoint()))) { + // TODO improve error message error("Another token expected.", getRule().ele00001AssignmentGroesse()); - marker.commit(); - announceLevelFinished(); - return result; + return result.getResult(); } case 2: - announceNextStep(); - result = consumeAssignment$9(nextEntryPoint()); - if (result!=ConsumeResult.SUCCESS) { + result.nextStep(); + if (result.didGroupFail(consumeAssignment$9(nextEntryPoint()))) { + // TODO improve error message error("Another token expected.", getRule().ele0001AssignmentBeschreibung()); - marker.commit(); - announceLevelFinished(); - return result; + return result.getResult(); } case 3: - announceNextStep(); - result = consumeKeyword$11(nextEntryPoint()); - if (result!=ConsumeResult.SUCCESS) { + result.nextStep(); + if (result.didGroupFail(consumeKeyword$11(nextEntryPoint()))) { + // TODO improve error message error("Another token expected.", getRule().ele001KeywordLeftCurlyBracket()); - marker.commit(); - announceLevelFinished(); - return result; + return result.getResult(); } case 4: - announceNextStep(); - result = consumeAlternatives$12(nextEntryPoint()); - if (result!=ConsumeResult.SUCCESS) { + result.nextStep(); + if (result.didGroupFail(consumeAlternatives$12(nextEntryPoint()))) { + // TODO improve error message error("Another token expected.", getRule().ele01Alternatives()); - marker.commit(); - announceLevelFinished(); - return result; + return result.getResult(); } case 5: - announceNextStep(); - result = consumeKeyword$26(nextEntryPoint()); - if (result!=ConsumeResult.SUCCESS) { + result.nextStep(); + if (result.didGroupFail(consumeKeyword$26(nextEntryPoint()))) { + // TODO improve error message error("Another token expected.", getRule().ele1KeywordRightCurlyBracket()); - marker.commit(); - announceLevelFinished(); - return result; + return result.getResult(); } } - marker.commit(); - announceLevelFinished(); - return result; + return result.getResult(); } protected int consumeKeyword$6(int entryPoint) throws Exception { @@ -156,9 +141,10 @@ public final class ReferenceGrammarSpielplatzConsumer extends NonTerminalConsume protected int consumeAssignment$9(int entryPoint) throws Exception { IMarker marker = mark(); int result = doConsumeAssignment$9(entryPoint); - if (result != ConsumeResult.SUCCESS) + if (result != ConsumeResult.SUCCESS) { marker.rollback(); - else + skipped(getRule().ele0001AssignmentBeschreibung()); + } else marker.commit(); return ConsumeResult.SUCCESS; } @@ -181,11 +167,12 @@ public final class ReferenceGrammarSpielplatzConsumer extends NonTerminalConsume marker.flush(); } marker.rollback(); + skipped(getRule().ele01Alternatives()); return ConsumeResult.SUCCESS; } protected int doConsumeAlternatives$12(int entryPoint) throws Exception { - AlternativesResult result = createAlternativesResult(); + AlternativesResult result = createAlternativesResult(getRule().ele01Alternatives()); switch(entryPoint) { case -1: // use fall through semantics of switch case result.reset(); 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 9f23e51..4f9beb1 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 @@ -52,61 +52,47 @@ public final class ReferenceGrammarSpielzeugConsumer extends NonTerminalConsumer } protected int consumeGroup$1(int entryPoint) throws Exception { - announceNextLevel(); - final IMarker marker = mark(); - int result = ConsumeResult.SUCCESS; + GroupResult result = createGroupResult(getRule().eleGroup()); switch(entryPoint) { case -1: // use fall through semantics of switch case - result = ConsumeResult.EMPTY_MATCH; + result.reset(); case 0: - announceNextStep(); - result = consumeKeyword$5(nextEntryPoint()); - if (result!=ConsumeResult.SUCCESS) { + result.nextStep(); + if (result.didGroupFail(consumeKeyword$5(nextEntryPoint()))) { + // TODO improve error message error("Another token expected.", getRule().ele0000KeywordSpielzeug()); - marker.commit(); - announceLevelFinished(); - return result; + return result.getResult(); } case 1: - announceNextStep(); - result = consumeKeyword$6(nextEntryPoint()); - if (result!=ConsumeResult.SUCCESS) { + result.nextStep(); + if (result.didGroupFail(consumeKeyword$6(nextEntryPoint()))) { + // TODO improve error message error("Another token expected.", getRule().ele0001KeywordLeftParenthesis()); - marker.commit(); - announceLevelFinished(); - return result; + return result.getResult(); } case 2: - announceNextStep(); - result = consumeAssignment$7(nextEntryPoint()); - if (result!=ConsumeResult.SUCCESS) { + result.nextStep(); + if (result.didGroupFail(consumeAssignment$7(nextEntryPoint()))) { + // TODO improve error message error("Another token expected.", getRule().ele001AssignmentName()); - marker.commit(); - announceLevelFinished(); - return result; + return result.getResult(); } case 3: - announceNextStep(); - result = consumeAssignment$9(nextEntryPoint()); - if (result!=ConsumeResult.SUCCESS) { + result.nextStep(); + if (result.didGroupFail(consumeAssignment$9(nextEntryPoint()))) { + // TODO improve error message error("Another token expected.", getRule().ele01AssignmentFarbe()); - marker.commit(); - announceLevelFinished(); - return result; + return result.getResult(); } case 4: - announceNextStep(); - result = consumeKeyword$11(nextEntryPoint()); - if (result!=ConsumeResult.SUCCESS) { + result.nextStep(); + if (result.didGroupFail(consumeKeyword$11(nextEntryPoint()))) { + // TODO improve error message error("Another token expected.", getRule().ele1KeywordRightParenthesis()); - marker.commit(); - announceLevelFinished(); - return result; + return result.getResult(); } } - marker.commit(); - announceLevelFinished(); - return result; + return result.getResult(); } protected int consumeKeyword$5(int entryPoint) throws Exception { diff --git a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/referenceGrammar/Erwachsener.java b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/referenceGrammar/Erwachsener.java index b3374c2..28c298b 100644 --- a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/referenceGrammar/Erwachsener.java +++ b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/referenceGrammar/Erwachsener.java @@ -2,7 +2,6 @@ * <copyright> * </copyright> * - * $Id: Erwachsener.java,v 1.5 2009/02/19 21:08:17 sefftinge Exp $ */ package org.eclipse.xtext.reference.referenceGrammar; diff --git a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/referenceGrammar/Familie.java b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/referenceGrammar/Familie.java index 270fabf..a7e12d2 100644 --- a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/referenceGrammar/Familie.java +++ b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/referenceGrammar/Familie.java @@ -2,7 +2,6 @@ * <copyright> * </copyright> * - * $Id: Familie.java,v 1.5 2009/02/19 21:08:17 sefftinge Exp $ */ package org.eclipse.xtext.reference.referenceGrammar; diff --git a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/referenceGrammar/Farbe.java b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/referenceGrammar/Farbe.java index 5db5ef7..0366f01 100644 --- a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/referenceGrammar/Farbe.java +++ b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/referenceGrammar/Farbe.java @@ -2,7 +2,6 @@ * <copyright> * </copyright> * - * $Id: Farbe.java,v 1.5 2009/02/19 21:08:17 sefftinge Exp $ */ package org.eclipse.xtext.reference.referenceGrammar; diff --git a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/referenceGrammar/Kind.java b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/referenceGrammar/Kind.java index c19b697..8a72add 100644 --- a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/referenceGrammar/Kind.java +++ b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/referenceGrammar/Kind.java @@ -2,7 +2,6 @@ * <copyright> * </copyright> * - * $Id: Kind.java,v 1.5 2009/02/19 21:08:17 sefftinge Exp $ */ package org.eclipse.xtext.reference.referenceGrammar; diff --git a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/referenceGrammar/Person.java b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/referenceGrammar/Person.java index fe4fd22..fe86066 100644 --- a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/referenceGrammar/Person.java +++ b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/referenceGrammar/Person.java @@ -2,7 +2,6 @@ * <copyright> * </copyright> * - * $Id: Person.java,v 1.5 2009/02/19 21:08:17 sefftinge Exp $ */ package org.eclipse.xtext.reference.referenceGrammar; diff --git a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/referenceGrammar/ReferenceGrammarFactory.java b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/referenceGrammar/ReferenceGrammarFactory.java index a04c033..fc89c71 100644 --- a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/referenceGrammar/ReferenceGrammarFactory.java +++ b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/referenceGrammar/ReferenceGrammarFactory.java @@ -2,7 +2,6 @@ * <copyright> * </copyright> * - * $Id: ReferenceGrammarFactory.java,v 1.5 2009/02/19 21:08:17 sefftinge Exp $ */ package org.eclipse.xtext.reference.referenceGrammar; diff --git a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/referenceGrammar/ReferenceGrammarPackage.java b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/referenceGrammar/ReferenceGrammarPackage.java index 79ee563..80ce1ca 100644 --- a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/referenceGrammar/ReferenceGrammarPackage.java +++ b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/referenceGrammar/ReferenceGrammarPackage.java @@ -2,7 +2,6 @@ * <copyright> * </copyright> * - * $Id: ReferenceGrammarPackage.java,v 1.5 2009/02/19 21:08:17 sefftinge Exp $ */ package org.eclipse.xtext.reference.referenceGrammar; diff --git a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/referenceGrammar/Spielplatz.java b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/referenceGrammar/Spielplatz.java index 05b41fb..c84124b 100644 --- a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/referenceGrammar/Spielplatz.java +++ b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/referenceGrammar/Spielplatz.java @@ -2,7 +2,6 @@ * <copyright> * </copyright> * - * $Id: Spielplatz.java,v 1.5 2009/02/19 21:08:17 sefftinge Exp $ */ package org.eclipse.xtext.reference.referenceGrammar; diff --git a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/referenceGrammar/Spielzeug.java b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/referenceGrammar/Spielzeug.java index 3669950..2486cc2 100644 --- a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/referenceGrammar/Spielzeug.java +++ b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/referenceGrammar/Spielzeug.java @@ -2,7 +2,6 @@ * <copyright> * </copyright> * - * $Id: Spielzeug.java,v 1.5 2009/02/19 21:08:17 sefftinge Exp $ */ package org.eclipse.xtext.reference.referenceGrammar; diff --git a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/referenceGrammar/impl/ErwachsenerImpl.java b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/referenceGrammar/impl/ErwachsenerImpl.java index 8cc61c7..12cc2f5 100644 --- a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/referenceGrammar/impl/ErwachsenerImpl.java +++ b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/referenceGrammar/impl/ErwachsenerImpl.java @@ -2,7 +2,6 @@ * <copyright> * </copyright> * - * $Id: ErwachsenerImpl.java,v 1.5 2009/02/19 21:08:18 sefftinge Exp $ */ package org.eclipse.xtext.reference.referenceGrammar.impl; diff --git a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/referenceGrammar/impl/FamilieImpl.java b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/referenceGrammar/impl/FamilieImpl.java index b2e55d0..f5df18a 100644 --- a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/referenceGrammar/impl/FamilieImpl.java +++ b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/referenceGrammar/impl/FamilieImpl.java @@ -2,7 +2,6 @@ * <copyright> * </copyright> * - * $Id: FamilieImpl.java,v 1.5 2009/02/19 21:08:17 sefftinge Exp $ */ package org.eclipse.xtext.reference.referenceGrammar.impl; diff --git a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/referenceGrammar/impl/FarbeImpl.java b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/referenceGrammar/impl/FarbeImpl.java index b5851fa..945fbb2 100644 --- a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/referenceGrammar/impl/FarbeImpl.java +++ b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/referenceGrammar/impl/FarbeImpl.java @@ -2,7 +2,6 @@ * <copyright> * </copyright> * - * $Id: FarbeImpl.java,v 1.5 2009/02/19 21:08:18 sefftinge Exp $ */ package org.eclipse.xtext.reference.referenceGrammar.impl; diff --git a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/referenceGrammar/impl/KindImpl.java b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/referenceGrammar/impl/KindImpl.java index f861ad3..5e54923 100644 --- a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/referenceGrammar/impl/KindImpl.java +++ b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/referenceGrammar/impl/KindImpl.java @@ -2,7 +2,6 @@ * <copyright> * </copyright> * - * $Id: KindImpl.java,v 1.5 2009/02/19 21:08:18 sefftinge Exp $ */ package org.eclipse.xtext.reference.referenceGrammar.impl; diff --git a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/referenceGrammar/impl/PersonImpl.java b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/referenceGrammar/impl/PersonImpl.java index af03ec2..85fde7a 100644 --- a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/referenceGrammar/impl/PersonImpl.java +++ b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/referenceGrammar/impl/PersonImpl.java @@ -2,7 +2,6 @@ * <copyright> * </copyright> * - * $Id: PersonImpl.java,v 1.5 2009/02/19 21:08:18 sefftinge Exp $ */ package org.eclipse.xtext.reference.referenceGrammar.impl; @@ -152,7 +151,7 @@ public class PersonImpl extends EObjectImpl implements Person case ReferenceGrammarPackage.PERSON__NAME: return getName(); case ReferenceGrammarPackage.PERSON__AGE: - return getAge(); + return new Integer(getAge()); } return super.eGet(featureID, resolve, coreType); } @@ -171,7 +170,7 @@ public class PersonImpl extends EObjectImpl implements Person setName((String)newValue); return; case ReferenceGrammarPackage.PERSON__AGE: - setAge((Integer)newValue); + setAge(((Integer)newValue).intValue()); return; } super.eSet(featureID, newValue); diff --git a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/referenceGrammar/impl/ReferenceGrammarFactoryImpl.java b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/referenceGrammar/impl/ReferenceGrammarFactoryImpl.java index afe6a8a..09894ca 100644 --- a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/referenceGrammar/impl/ReferenceGrammarFactoryImpl.java +++ b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/referenceGrammar/impl/ReferenceGrammarFactoryImpl.java @@ -2,7 +2,6 @@ * <copyright> * </copyright> * - * $Id: ReferenceGrammarFactoryImpl.java,v 1.5 2009/02/19 21:08:17 sefftinge Exp $ */ package org.eclipse.xtext.reference.referenceGrammar.impl; diff --git a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/referenceGrammar/impl/ReferenceGrammarPackageImpl.java b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/referenceGrammar/impl/ReferenceGrammarPackageImpl.java index 001e57c..e5978b5 100644 --- a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/referenceGrammar/impl/ReferenceGrammarPackageImpl.java +++ b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/referenceGrammar/impl/ReferenceGrammarPackageImpl.java @@ -2,7 +2,6 @@ * <copyright> * </copyright> * - * $Id: ReferenceGrammarPackageImpl.java,v 1.5 2009/02/19 21:08:18 sefftinge Exp $ */ package org.eclipse.xtext.reference.referenceGrammar.impl; diff --git a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/referenceGrammar/impl/SpielplatzImpl.java b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/referenceGrammar/impl/SpielplatzImpl.java index 1167df1..cadffb9 100644 --- a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/referenceGrammar/impl/SpielplatzImpl.java +++ b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/referenceGrammar/impl/SpielplatzImpl.java @@ -2,7 +2,6 @@ * <copyright> * </copyright> * - * $Id: SpielplatzImpl.java,v 1.5 2009/02/19 21:08:18 sefftinge Exp $ */ package org.eclipse.xtext.reference.referenceGrammar.impl; @@ -314,7 +313,7 @@ public class SpielplatzImpl extends EObjectImpl implements Spielplatz switch (featureID) { case ReferenceGrammarPackage.SPIELPLATZ__GROESSE: - return getGroesse(); + return new Integer(getGroesse()); case ReferenceGrammarPackage.SPIELPLATZ__BESCHREIBUNG: return getBeschreibung(); case ReferenceGrammarPackage.SPIELPLATZ__KINDER: @@ -343,7 +342,7 @@ public class SpielplatzImpl extends EObjectImpl implements Spielplatz switch (featureID) { case ReferenceGrammarPackage.SPIELPLATZ__GROESSE: - setGroesse((Integer)newValue); + setGroesse(((Integer)newValue).intValue()); return; case ReferenceGrammarPackage.SPIELPLATZ__BESCHREIBUNG: setBeschreibung((String)newValue); diff --git a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/referenceGrammar/impl/SpielzeugImpl.java b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/referenceGrammar/impl/SpielzeugImpl.java index fb55845..f0ddb78 100644 --- a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/referenceGrammar/impl/SpielzeugImpl.java +++ b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/referenceGrammar/impl/SpielzeugImpl.java @@ -2,7 +2,6 @@ * <copyright> * </copyright> * - * $Id: SpielzeugImpl.java,v 1.5 2009/02/19 21:08:18 sefftinge Exp $ */ package org.eclipse.xtext.reference.referenceGrammar.impl; diff --git a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/referenceGrammar/util/ReferenceGrammarAdapterFactory.java b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/referenceGrammar/util/ReferenceGrammarAdapterFactory.java index c81ca54..8fb851d 100644 --- a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/referenceGrammar/util/ReferenceGrammarAdapterFactory.java +++ b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/referenceGrammar/util/ReferenceGrammarAdapterFactory.java @@ -2,7 +2,6 @@ * <copyright> * </copyright> * - * $Id: ReferenceGrammarAdapterFactory.java,v 1.5 2009/02/19 21:08:17 sefftinge Exp $ */ package org.eclipse.xtext.reference.referenceGrammar.util; diff --git a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/referenceGrammar/util/ReferenceGrammarSwitch.java b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/referenceGrammar/util/ReferenceGrammarSwitch.java index 1e579a1..1699dbb 100644 --- a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/referenceGrammar/util/ReferenceGrammarSwitch.java +++ b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/referenceGrammar/util/ReferenceGrammarSwitch.java @@ -2,7 +2,6 @@ * <copyright> * </copyright> * - * $Id: ReferenceGrammarSwitch.java,v 1.5 2009/02/19 21:08:17 sefftinge Exp $ */ package org.eclipse.xtext.reference.referenceGrammar.util; diff --git a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/Domainmodel.genmodel b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/Domainmodel.genmodel index 282d08d..979d47e 100644 --- a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/Domainmodel.genmodel +++ b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/Domainmodel.genmodel @@ -1,86 +1,86 @@ <?xml version="1.0" encoding="ASCII"?> <genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="../org.eclipse.xtext.example.domainmodel/src-gen" forceOverwrite="true" bundleManifest="false" complianceLevel="5.0" copyrightFields="false"> <genPackages prefix="Domainmodel" basePackage="org.eclipse.xtext.example" disposableProviderFactory="true"> - <ecorePackage href="file:/Users/svenefftinge/Documents/workspace/ws-oAW5/develop/../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/Domainmodel.ecore#/"/> + <ecorePackage href="file:/Users/zarnekow/EclipseWorkspaces/3.5M5/develop/../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/Domainmodel.ecore#/"/> <genClasses> - <ecoreClass href="file:/Users/svenefftinge/Documents/workspace/ws-oAW5/develop/../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/Domainmodel.ecore#//File"/> + <ecoreClass href="file:/Users/zarnekow/EclipseWorkspaces/3.5M5/develop/../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/Domainmodel.ecore#//File"/> <genFeatures property="None" children="true" createChild="true"> - <ecoreFeature xsi:type="ecore:EReference" href="file:/Users/svenefftinge/Documents/workspace/ws-oAW5/develop/../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/Domainmodel.ecore#//File/imports"/> + <ecoreFeature xsi:type="ecore:EReference" href="file:/Users/zarnekow/EclipseWorkspaces/3.5M5/develop/../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/Domainmodel.ecore#//File/imports"/> </genFeatures> <genFeatures property="None" children="true" createChild="true"> - <ecoreFeature xsi:type="ecore:EReference" href="file:/Users/svenefftinge/Documents/workspace/ws-oAW5/develop/../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/Domainmodel.ecore#//File/namedElements"/> + <ecoreFeature xsi:type="ecore:EReference" href="file:/Users/zarnekow/EclipseWorkspaces/3.5M5/develop/../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/Domainmodel.ecore#//File/namedElements"/> </genFeatures> </genClasses> <genClasses> - <ecoreClass href="file:/Users/svenefftinge/Documents/workspace/ws-oAW5/develop/../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/Domainmodel.ecore#//Import"/> + <ecoreClass href="file:/Users/zarnekow/EclipseWorkspaces/3.5M5/develop/../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/Domainmodel.ecore#//Import"/> <genFeatures createChild="false"> - <ecoreFeature xsi:type="ecore:EAttribute" href="file:/Users/svenefftinge/Documents/workspace/ws-oAW5/develop/../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/Domainmodel.ecore#//Import/importURI"/> + <ecoreFeature xsi:type="ecore:EAttribute" href="file:/Users/zarnekow/EclipseWorkspaces/3.5M5/develop/../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/Domainmodel.ecore#//Import/importURI"/> </genFeatures> </genClasses> <genClasses> - <ecoreClass href="file:/Users/svenefftinge/Documents/workspace/ws-oAW5/develop/../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/Domainmodel.ecore#//NamedElement"/> + <ecoreClass href="file:/Users/zarnekow/EclipseWorkspaces/3.5M5/develop/../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/Domainmodel.ecore#//NamedElement"/> <genFeatures createChild="false"> - <ecoreFeature xsi:type="ecore:EAttribute" href="file:/Users/svenefftinge/Documents/workspace/ws-oAW5/develop/../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/Domainmodel.ecore#//NamedElement/name"/> + <ecoreFeature xsi:type="ecore:EAttribute" href="file:/Users/zarnekow/EclipseWorkspaces/3.5M5/develop/../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/Domainmodel.ecore#//NamedElement/name"/> </genFeatures> </genClasses> <genClasses> - <ecoreClass href="file:/Users/svenefftinge/Documents/workspace/ws-oAW5/develop/../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/Domainmodel.ecore#//Package"/> + <ecoreClass href="file:/Users/zarnekow/EclipseWorkspaces/3.5M5/develop/../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/Domainmodel.ecore#//Package"/> <genFeatures property="None" children="true" createChild="true"> - <ecoreFeature xsi:type="ecore:EReference" href="file:/Users/svenefftinge/Documents/workspace/ws-oAW5/develop/../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/Domainmodel.ecore#//Package/namedElements"/> + <ecoreFeature xsi:type="ecore:EReference" href="file:/Users/zarnekow/EclipseWorkspaces/3.5M5/develop/../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/Domainmodel.ecore#//Package/namedElements"/> </genFeatures> </genClasses> <genClasses> - <ecoreClass href="file:/Users/svenefftinge/Documents/workspace/ws-oAW5/develop/../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/Domainmodel.ecore#//Type"/> + <ecoreClass href="file:/Users/zarnekow/EclipseWorkspaces/3.5M5/develop/../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/Domainmodel.ecore#//Type"/> </genClasses> <genClasses> - <ecoreClass href="file:/Users/svenefftinge/Documents/workspace/ws-oAW5/develop/../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/Domainmodel.ecore#//DataType"/> + <ecoreClass href="file:/Users/zarnekow/EclipseWorkspaces/3.5M5/develop/../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/Domainmodel.ecore#//DataType"/> </genClasses> <genClasses> - <ecoreClass href="file:/Users/svenefftinge/Documents/workspace/ws-oAW5/develop/../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/Domainmodel.ecore#//Entity"/> + <ecoreClass href="file:/Users/zarnekow/EclipseWorkspaces/3.5M5/develop/../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/Domainmodel.ecore#//Entity"/> <genFeatures notify="false" createChild="false" propertySortChoices="true"> - <ecoreFeature xsi:type="ecore:EReference" href="file:/Users/svenefftinge/Documents/workspace/ws-oAW5/develop/../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/Domainmodel.ecore#//Entity/superType"/> + <ecoreFeature xsi:type="ecore:EReference" href="file:/Users/zarnekow/EclipseWorkspaces/3.5M5/develop/../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/Domainmodel.ecore#//Entity/superType"/> </genFeatures> <genFeatures property="None" children="true" createChild="true"> - <ecoreFeature xsi:type="ecore:EReference" href="file:/Users/svenefftinge/Documents/workspace/ws-oAW5/develop/../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/Domainmodel.ecore#//Entity/features"/> + <ecoreFeature xsi:type="ecore:EReference" href="file:/Users/zarnekow/EclipseWorkspaces/3.5M5/develop/../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/Domainmodel.ecore#//Entity/features"/> </genFeatures> </genClasses> <genClasses> - <ecoreClass href="file:/Users/svenefftinge/Documents/workspace/ws-oAW5/develop/../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/Domainmodel.ecore#//Feature"/> + <ecoreClass href="file:/Users/zarnekow/EclipseWorkspaces/3.5M5/develop/../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/Domainmodel.ecore#//Feature"/> </genClasses> <genClasses> - <ecoreClass href="file:/Users/svenefftinge/Documents/workspace/ws-oAW5/develop/../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/Domainmodel.ecore#//StructuralFeature"/> + <ecoreClass href="file:/Users/zarnekow/EclipseWorkspaces/3.5M5/develop/../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/Domainmodel.ecore#//StructuralFeature"/> </genClasses> <genClasses> - <ecoreClass href="file:/Users/svenefftinge/Documents/workspace/ws-oAW5/develop/../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/Domainmodel.ecore#//Attribute"/> + <ecoreClass href="file:/Users/zarnekow/EclipseWorkspaces/3.5M5/develop/../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/Domainmodel.ecore#//Attribute"/> </genClasses> <genClasses> - <ecoreClass href="file:/Users/svenefftinge/Documents/workspace/ws-oAW5/develop/../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/Domainmodel.ecore#//Reference"/> + <ecoreClass href="file:/Users/zarnekow/EclipseWorkspaces/3.5M5/develop/../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/Domainmodel.ecore#//Reference"/> <genFeatures notify="false" createChild="false" propertySortChoices="true"> - <ecoreFeature xsi:type="ecore:EReference" href="file:/Users/svenefftinge/Documents/workspace/ws-oAW5/develop/../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/Domainmodel.ecore#//Reference/opposite"/> + <ecoreFeature xsi:type="ecore:EReference" href="file:/Users/zarnekow/EclipseWorkspaces/3.5M5/develop/../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/Domainmodel.ecore#//Reference/opposite"/> </genFeatures> </genClasses> <genClasses> - <ecoreClass href="file:/Users/svenefftinge/Documents/workspace/ws-oAW5/develop/../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/Domainmodel.ecore#//Operation"/> + <ecoreClass href="file:/Users/zarnekow/EclipseWorkspaces/3.5M5/develop/../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/Domainmodel.ecore#//Operation"/> <genFeatures property="None" children="true" createChild="true"> - <ecoreFeature xsi:type="ecore:EReference" href="file:/Users/svenefftinge/Documents/workspace/ws-oAW5/develop/../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/Domainmodel.ecore#//Operation/params"/> + <ecoreFeature xsi:type="ecore:EReference" href="file:/Users/zarnekow/EclipseWorkspaces/3.5M5/develop/../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/Domainmodel.ecore#//Operation/params"/> </genFeatures> </genClasses> <genClasses> - <ecoreClass href="file:/Users/svenefftinge/Documents/workspace/ws-oAW5/develop/../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/Domainmodel.ecore#//Parameter"/> + <ecoreClass href="file:/Users/zarnekow/EclipseWorkspaces/3.5M5/develop/../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/Domainmodel.ecore#//Parameter"/> </genClasses> <genClasses> - <ecoreClass href="file:/Users/svenefftinge/Documents/workspace/ws-oAW5/develop/../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/Domainmodel.ecore#//TypedElement"/> + <ecoreClass href="file:/Users/zarnekow/EclipseWorkspaces/3.5M5/develop/../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/Domainmodel.ecore#//TypedElement"/> <genFeatures createChild="false"> - <ecoreFeature xsi:type="ecore:EAttribute" href="file:/Users/svenefftinge/Documents/workspace/ws-oAW5/develop/../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/Domainmodel.ecore#//TypedElement/name"/> + <ecoreFeature xsi:type="ecore:EAttribute" href="file:/Users/zarnekow/EclipseWorkspaces/3.5M5/develop/../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/Domainmodel.ecore#//TypedElement/name"/> </genFeatures> <genFeatures property="None" children="true" createChild="true"> - <ecoreFeature xsi:type="ecore:EReference" href="file:/Users/svenefftinge/Documents/workspace/ws-oAW5/develop/../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/Domainmodel.ecore#//TypedElement/type"/> + <ecoreFeature xsi:type="ecore:EReference" href="file:/Users/zarnekow/EclipseWorkspaces/3.5M5/develop/../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/Domainmodel.ecore#//TypedElement/type"/> </genFeatures> </genClasses> <genClasses> - <ecoreClass href="file:/Users/svenefftinge/Documents/workspace/ws-oAW5/develop/../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/Domainmodel.ecore#//TypeRef"/> + <ecoreClass href="file:/Users/zarnekow/EclipseWorkspaces/3.5M5/develop/../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/Domainmodel.ecore#//TypeRef"/> <genFeatures notify="false" createChild="false" propertySortChoices="true"> - <ecoreFeature xsi:type="ecore:EReference" href="file:/Users/svenefftinge/Documents/workspace/ws-oAW5/develop/../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/Domainmodel.ecore#//TypeRef/referenced"/> + <ecoreFeature xsi:type="ecore:EReference" href="file:/Users/zarnekow/EclipseWorkspaces/3.5M5/develop/../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/Domainmodel.ecore#//TypeRef/referenced"/> </genFeatures> </genClasses> </genPackages> diff --git a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/domainmodel/Attribute.java b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/domainmodel/Attribute.java index 89683b9..2f0ef69 100644 --- a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/domainmodel/Attribute.java +++ b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/domainmodel/Attribute.java @@ -2,7 +2,6 @@ * <copyright> * </copyright> * - * $Id: Attribute.java,v 1.5 2009/02/19 21:06:43 sefftinge Exp $ */ package org.eclipse.xtext.example.domainmodel; diff --git a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/domainmodel/DataType.java b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/domainmodel/DataType.java index 55f32e6..fd7d647 100644 --- a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/domainmodel/DataType.java +++ b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/domainmodel/DataType.java @@ -2,7 +2,6 @@ * <copyright> * </copyright> * - * $Id: DataType.java,v 1.5 2009/02/19 21:06:40 sefftinge Exp $ */ package org.eclipse.xtext.example.domainmodel; diff --git a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/domainmodel/DomainmodelFactory.java b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/domainmodel/DomainmodelFactory.java index f7949b7..dd9c634 100644 --- a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/domainmodel/DomainmodelFactory.java +++ b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/domainmodel/DomainmodelFactory.java @@ -2,7 +2,6 @@ * <copyright> * </copyright> * - * $Id: DomainmodelFactory.java,v 1.5 2009/02/19 21:06:42 sefftinge Exp $ */ package org.eclipse.xtext.example.domainmodel; @@ -60,7 +59,7 @@ public interface DomainmodelFactory extends EFactory * @return a new object of class '<em>Package</em>'. * @generated */ - Package createPackage(); + org.eclipse.xtext.example.domainmodel.Package createPackage(); /** * Returns a new object of class '<em>Type</em>'. diff --git a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/domainmodel/DomainmodelPackage.java b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/domainmodel/DomainmodelPackage.java index b60d082..6abb47d 100644 --- a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/domainmodel/DomainmodelPackage.java +++ b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/domainmodel/DomainmodelPackage.java @@ -2,7 +2,6 @@ * <copyright> * </copyright> * - * $Id: DomainmodelPackage.java,v 1.5 2009/02/19 21:06:44 sefftinge Exp $ */ package org.eclipse.xtext.example.domainmodel; diff --git a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/domainmodel/Entity.java b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/domainmodel/Entity.java index 69fb2ac..212ab7f 100644 --- a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/domainmodel/Entity.java +++ b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/domainmodel/Entity.java @@ -2,7 +2,6 @@ * <copyright> * </copyright> * - * $Id: Entity.java,v 1.5 2009/02/19 21:06:44 sefftinge Exp $ */ package org.eclipse.xtext.example.domainmodel; diff --git a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/domainmodel/Feature.java b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/domainmodel/Feature.java index e6bfc9c..29cfbe3 100644 --- a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/domainmodel/Feature.java +++ b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/domainmodel/Feature.java @@ -2,7 +2,6 @@ * <copyright> * </copyright> * - * $Id: Feature.java,v 1.5 2009/02/19 21:06:42 sefftinge Exp $ */ package org.eclipse.xtext.example.domainmodel; diff --git a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/domainmodel/File.java b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/domainmodel/File.java index 8a1034c..8c11ec5 100644 --- a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/domainmodel/File.java +++ b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/domainmodel/File.java @@ -2,7 +2,6 @@ * <copyright> * </copyright> * - * $Id: File.java,v 1.5 2009/02/19 21:06:41 sefftinge Exp $ */ package org.eclipse.xtext.example.domainmodel; diff --git a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/domainmodel/Import.java b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/domainmodel/Import.java index a090ea0..2003f29 100644 --- a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/domainmodel/Import.java +++ b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/domainmodel/Import.java @@ -2,7 +2,6 @@ * <copyright> * </copyright> * - * $Id: Import.java,v 1.5 2009/02/19 21:06:43 sefftinge Exp $ */ package org.eclipse.xtext.example.domainmodel; diff --git a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/domainmodel/NamedElement.java b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/domainmodel/NamedElement.java index cc39ab9..532b8c2 100644 --- a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/domainmodel/NamedElement.java +++ b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/domainmodel/NamedElement.java @@ -2,7 +2,6 @@ * <copyright> * </copyright> * - * $Id: NamedElement.java,v 1.5 2009/02/19 21:06:46 sefftinge Exp $ */ package org.eclipse.xtext.example.domainmodel; diff --git a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/domainmodel/Operation.java b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/domainmodel/Operation.java index 51a389f..1e02288 100644 --- a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/domainmodel/Operation.java +++ b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/domainmodel/Operation.java @@ -2,7 +2,6 @@ * <copyright> * </copyright> * - * $Id: Operation.java,v 1.5 2009/02/19 21:06:45 sefftinge Exp $ */ package org.eclipse.xtext.example.domainmodel; diff --git a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/domainmodel/Package.java b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/domainmodel/Package.java index 95ed0c5..ec1775d 100644 --- a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/domainmodel/Package.java +++ b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/domainmodel/Package.java @@ -2,7 +2,6 @@ * <copyright> * </copyright> * - * $Id: Package.java,v 1.5 2009/02/19 21:06:38 sefftinge Exp $ */ package org.eclipse.xtext.example.domainmodel; diff --git a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/domainmodel/Parameter.java b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/domainmodel/Parameter.java index 5ad34f4..1278824 100644 --- a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/domainmodel/Parameter.java +++ b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/domainmodel/Parameter.java @@ -2,7 +2,6 @@ * <copyright> * </copyright> * - * $Id: Parameter.java,v 1.5 2009/02/19 21:06:39 sefftinge Exp $ */ package org.eclipse.xtext.example.domainmodel; diff --git a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/domainmodel/Reference.java b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/domainmodel/Reference.java index 8f10f32..c8471ba 100644 --- a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/domainmodel/Reference.java +++ b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/domainmodel/Reference.java @@ -2,7 +2,6 @@ * <copyright> * </copyright> * - * $Id: Reference.java,v 1.5 2009/02/19 21:06:37 sefftinge Exp $ */ package org.eclipse.xtext.example.domainmodel; diff --git a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/domainmodel/StructuralFeature.java b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/domainmodel/StructuralFeature.java index f4a48af..5676870 100644 --- a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/domainmodel/StructuralFeature.java +++ b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/domainmodel/StructuralFeature.java @@ -2,7 +2,6 @@ * <copyright> * </copyright> * - * $Id: StructuralFeature.java,v 1.5 2009/02/19 21:06:43 sefftinge Exp $ */ package org.eclipse.xtext.example.domainmodel; diff --git a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/domainmodel/Type.java b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/domainmodel/Type.java index e80b99a..ce055ff 100644 --- a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/domainmodel/Type.java +++ b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/domainmodel/Type.java @@ -2,7 +2,6 @@ * <copyright> * </copyright> * - * $Id: Type.java,v 1.5 2009/02/19 21:06:42 sefftinge Exp $ */ package org.eclipse.xtext.example.domainmodel; diff --git a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/domainmodel/TypeRef.java b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/domainmodel/TypeRef.java index 6da36b5..b6b7d60 100644 --- a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/domainmodel/TypeRef.java +++ b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/domainmodel/TypeRef.java @@ -2,7 +2,6 @@ * <copyright> * </copyright> * - * $Id: TypeRef.java,v 1.5 2009/02/19 21:06:46 sefftinge Exp $ */ package org.eclipse.xtext.example.domainmodel; diff --git a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/domainmodel/TypedElement.java b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/domainmodel/TypedElement.java index 442f92b..3d7cfc9 100644 --- a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/domainmodel/TypedElement.java +++ b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/domainmodel/TypedElement.java @@ -2,7 +2,6 @@ * <copyright> * </copyright> * - * $Id: TypedElement.java,v 1.5 2009/02/19 21:06:44 sefftinge Exp $ */ package org.eclipse.xtext.example.domainmodel; diff --git a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/domainmodel/impl/AttributeImpl.java b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/domainmodel/impl/AttributeImpl.java index ac2ab3f..2b34502 100644 --- a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/domainmodel/impl/AttributeImpl.java +++ b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/domainmodel/impl/AttributeImpl.java @@ -2,7 +2,6 @@ * <copyright> * </copyright> * - * $Id: AttributeImpl.java,v 1.5 2009/02/19 21:06:47 sefftinge Exp $ */ package org.eclipse.xtext.example.domainmodel.impl; diff --git a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/domainmodel/impl/DataTypeImpl.java b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/domainmodel/impl/DataTypeImpl.java index 4810a01..8861202 100644 --- a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/domainmodel/impl/DataTypeImpl.java +++ b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/domainmodel/impl/DataTypeImpl.java @@ -2,7 +2,6 @@ * <copyright> * </copyright> * - * $Id: DataTypeImpl.java,v 1.5 2009/02/19 21:06:48 sefftinge Exp $ */ package org.eclipse.xtext.example.domainmodel.impl; diff --git a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/domainmodel/impl/DomainmodelFactoryImpl.java b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/domainmodel/impl/DomainmodelFactoryImpl.java index e861b05..97e59d9 100644 --- a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/domainmodel/impl/DomainmodelFactoryImpl.java +++ b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/domainmodel/impl/DomainmodelFactoryImpl.java @@ -2,7 +2,6 @@ * <copyright> * </copyright> * - * $Id: DomainmodelFactoryImpl.java,v 1.5 2009/02/19 21:06:48 sefftinge Exp $ */ package org.eclipse.xtext.example.domainmodel.impl; diff --git a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/domainmodel/impl/DomainmodelPackageImpl.java b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/domainmodel/impl/DomainmodelPackageImpl.java index 898adeb..b58ec39 100644 --- a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/domainmodel/impl/DomainmodelPackageImpl.java +++ b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/domainmodel/impl/DomainmodelPackageImpl.java @@ -2,7 +2,6 @@ * <copyright> * </copyright> * - * $Id: DomainmodelPackageImpl.java,v 1.5 2009/02/19 21:06:49 sefftinge Exp $ */ package org.eclipse.xtext.example.domainmodel.impl; diff --git a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/domainmodel/impl/EntityImpl.java b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/domainmodel/impl/EntityImpl.java index aa35eda..b22a7a8 100644 --- a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/domainmodel/impl/EntityImpl.java +++ b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/domainmodel/impl/EntityImpl.java @@ -2,7 +2,6 @@ * <copyright> * </copyright> * - * $Id: EntityImpl.java,v 1.5 2009/02/19 21:06:46 sefftinge Exp $ */ package org.eclipse.xtext.example.domainmodel.impl; diff --git a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/domainmodel/impl/FeatureImpl.java b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/domainmodel/impl/FeatureImpl.java index 322217e..032ee27 100644 --- a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/domainmodel/impl/FeatureImpl.java +++ b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/domainmodel/impl/FeatureImpl.java @@ -2,7 +2,6 @@ * <copyright> * </copyright> * - * $Id: FeatureImpl.java,v 1.5 2009/02/19 21:06:46 sefftinge Exp $ */ package org.eclipse.xtext.example.domainmodel.impl; diff --git a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/domainmodel/impl/FileImpl.java b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/domainmodel/impl/FileImpl.java index a9a9382..cffa6ce 100644 --- a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/domainmodel/impl/FileImpl.java +++ b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/domainmodel/impl/FileImpl.java @@ -2,7 +2,6 @@ * <copyright> * </copyright> * - * $Id: FileImpl.java,v 1.5 2009/02/19 21:06:47 sefftinge Exp $ */ package org.eclipse.xtext.example.domainmodel.impl; diff --git a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/domainmodel/impl/ImportImpl.java b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/domainmodel/impl/ImportImpl.java index 4bbe5a8..fc837b5 100644 --- a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/domainmodel/impl/ImportImpl.java +++ b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/domainmodel/impl/ImportImpl.java @@ -2,7 +2,6 @@ * <copyright> * </copyright> * - * $Id: ImportImpl.java,v 1.5 2009/02/19 21:06:48 sefftinge Exp $ */ package org.eclipse.xtext.example.domainmodel.impl; diff --git a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/domainmodel/impl/NamedElementImpl.java b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/domainmodel/impl/NamedElementImpl.java index 96a0855..912ceb1 100644 --- a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/domainmodel/impl/NamedElementImpl.java +++ b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/domainmodel/impl/NamedElementImpl.java @@ -2,7 +2,6 @@ * <copyright> * </copyright> * - * $Id: NamedElementImpl.java,v 1.5 2009/02/19 21:06:46 sefftinge Exp $ */ package org.eclipse.xtext.example.domainmodel.impl; diff --git a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/domainmodel/impl/OperationImpl.java b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/domainmodel/impl/OperationImpl.java index 6e1eb47..07944f6 100644 --- a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/domainmodel/impl/OperationImpl.java +++ b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/domainmodel/impl/OperationImpl.java @@ -2,7 +2,6 @@ * <copyright> * </copyright> * - * $Id: OperationImpl.java,v 1.5 2009/02/19 21:06:47 sefftinge Exp $ */ package org.eclipse.xtext.example.domainmodel.impl; diff --git a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/domainmodel/impl/PackageImpl.java b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/domainmodel/impl/PackageImpl.java index aa7e9fc..714e72f 100644 --- a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/domainmodel/impl/PackageImpl.java +++ b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/domainmodel/impl/PackageImpl.java @@ -2,7 +2,6 @@ * <copyright> * </copyright> * - * $Id: PackageImpl.java,v 1.5 2009/02/19 21:06:47 sefftinge Exp $ */ package org.eclipse.xtext.example.domainmodel.impl; diff --git a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/domainmodel/impl/ParameterImpl.java b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/domainmodel/impl/ParameterImpl.java index 1ab124d..7247ee6 100644 --- a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/domainmodel/impl/ParameterImpl.java +++ b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/domainmodel/impl/ParameterImpl.java @@ -2,7 +2,6 @@ * <copyright> * </copyright> * - * $Id: ParameterImpl.java,v 1.5 2009/02/19 21:06:49 sefftinge Exp $ */ package org.eclipse.xtext.example.domainmodel.impl; diff --git a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/domainmodel/impl/ReferenceImpl.java b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/domainmodel/impl/ReferenceImpl.java index c1c4301..d41619e 100644 --- a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/domainmodel/impl/ReferenceImpl.java +++ b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/domainmodel/impl/ReferenceImpl.java @@ -2,7 +2,6 @@ * <copyright> * </copyright> * - * $Id: ReferenceImpl.java,v 1.5 2009/02/19 21:06:46 sefftinge Exp $ */ package org.eclipse.xtext.example.domainmodel.impl; diff --git a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/domainmodel/impl/StructuralFeatureImpl.java b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/domainmodel/impl/StructuralFeatureImpl.java index 0d96626..1c255ec 100644 --- a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/domainmodel/impl/StructuralFeatureImpl.java +++ b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/domainmodel/impl/StructuralFeatureImpl.java @@ -2,7 +2,6 @@ * <copyright> * </copyright> * - * $Id: StructuralFeatureImpl.java,v 1.5 2009/02/19 21:06:47 sefftinge Exp $ */ package org.eclipse.xtext.example.domainmodel.impl; diff --git a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/domainmodel/impl/TypeImpl.java b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/domainmodel/impl/TypeImpl.java index ee9254b..1c95170 100644 --- a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/domainmodel/impl/TypeImpl.java +++ b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/domainmodel/impl/TypeImpl.java @@ -2,7 +2,6 @@ * <copyright> * </copyright> * - * $Id: TypeImpl.java,v 1.5 2009/02/19 21:06:49 sefftinge Exp $ */ package org.eclipse.xtext.example.domainmodel.impl; diff --git a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/domainmodel/impl/TypeRefImpl.java b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/domainmodel/impl/TypeRefImpl.java index 37b3b5f..cb3b200 100644 --- a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/domainmodel/impl/TypeRefImpl.java +++ b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/domainmodel/impl/TypeRefImpl.java @@ -2,7 +2,6 @@ * <copyright> * </copyright> * - * $Id: TypeRefImpl.java,v 1.5 2009/02/19 21:06:48 sefftinge Exp $ */ package org.eclipse.xtext.example.domainmodel.impl; diff --git a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/domainmodel/impl/TypedElementImpl.java b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/domainmodel/impl/TypedElementImpl.java index 5284e04..533efe0 100644 --- a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/domainmodel/impl/TypedElementImpl.java +++ b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/domainmodel/impl/TypedElementImpl.java @@ -2,7 +2,6 @@ * <copyright> * </copyright> * - * $Id: TypedElementImpl.java,v 1.5 2009/02/19 21:06:48 sefftinge Exp $ */ package org.eclipse.xtext.example.domainmodel.impl; diff --git a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/domainmodel/util/DomainmodelAdapterFactory.java b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/domainmodel/util/DomainmodelAdapterFactory.java index 036c313..7c96064 100644 --- a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/domainmodel/util/DomainmodelAdapterFactory.java +++ b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/domainmodel/util/DomainmodelAdapterFactory.java @@ -2,7 +2,6 @@ * <copyright> * </copyright> * - * $Id: DomainmodelAdapterFactory.java,v 1.5 2009/02/19 21:06:36 sefftinge Exp $ */ package org.eclipse.xtext.example.domainmodel.util; diff --git a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/domainmodel/util/DomainmodelSwitch.java b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/domainmodel/util/DomainmodelSwitch.java index f5107f8..2997502 100644 --- a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/domainmodel/util/DomainmodelSwitch.java +++ b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/domainmodel/util/DomainmodelSwitch.java @@ -2,7 +2,6 @@ * <copyright> * </copyright> * - * $Id: DomainmodelSwitch.java,v 1.5 2009/02/19 21:06:37 sefftinge Exp $ */ package org.eclipse.xtext.example.domainmodel.util; 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 6895ded..d230bdf 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 @@ -49,52 +49,40 @@ public final class DomainmodelAttributeConsumer extends NonTerminalConsumer { } protected int consumeGroup$1(int entryPoint) throws Exception { - announceNextLevel(); - final IMarker marker = mark(); - int result = ConsumeResult.SUCCESS; + GroupResult result = createGroupResult(getRule().eleGroup()); switch(entryPoint) { case -1: // use fall through semantics of switch case - result = ConsumeResult.EMPTY_MATCH; + result.reset(); case 0: - announceNextStep(); - result = consumeKeyword$4(nextEntryPoint()); - if (result!=ConsumeResult.SUCCESS) { + result.nextStep(); + if (result.didGroupFail(consumeKeyword$4(nextEntryPoint()))) { + // TODO improve error message error("Another token expected.", getRule().ele000KeywordAttr()); - marker.commit(); - announceLevelFinished(); - return result; + return result.getResult(); } case 1: - announceNextStep(); - result = consumeAssignment$5(nextEntryPoint()); - if (result!=ConsumeResult.SUCCESS) { + result.nextStep(); + if (result.didGroupFail(consumeAssignment$5(nextEntryPoint()))) { + // TODO improve error message error("Another token expected.", getRule().ele001AssignmentName()); - marker.commit(); - announceLevelFinished(); - return result; + return result.getResult(); } case 2: - announceNextStep(); - result = consumeKeyword$7(nextEntryPoint()); - if (result!=ConsumeResult.SUCCESS) { + result.nextStep(); + if (result.didGroupFail(consumeKeyword$7(nextEntryPoint()))) { + // TODO improve error message error("Another token expected.", getRule().ele01KeywordColon()); - marker.commit(); - announceLevelFinished(); - return result; + return result.getResult(); } case 3: - announceNextStep(); - result = consumeAssignment$8(nextEntryPoint()); - if (result!=ConsumeResult.SUCCESS) { + result.nextStep(); + if (result.didGroupFail(consumeAssignment$8(nextEntryPoint()))) { + // TODO improve error message error("Another token expected.", getRule().ele1AssignmentType()); - marker.commit(); - announceLevelFinished(); - return result; + return result.getResult(); } } - marker.commit(); - announceLevelFinished(); - return result; + return result.getResult(); } protected int consumeKeyword$4(int entryPoint) throws Exception { 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 800896a..df124f7 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 @@ -44,34 +44,26 @@ public final class DomainmodelDataTypeConsumer extends NonTerminalConsumer { } protected int consumeGroup$1(int entryPoint) throws Exception { - announceNextLevel(); - final IMarker marker = mark(); - int result = ConsumeResult.SUCCESS; + GroupResult result = createGroupResult(getRule().eleGroup()); switch(entryPoint) { case -1: // use fall through semantics of switch case - result = ConsumeResult.EMPTY_MATCH; + result.reset(); case 0: - announceNextStep(); - result = consumeKeyword$2(nextEntryPoint()); - if (result!=ConsumeResult.SUCCESS) { + result.nextStep(); + if (result.didGroupFail(consumeKeyword$2(nextEntryPoint()))) { + // TODO improve error message error("Another token expected.", getRule().ele0KeywordDatatype()); - marker.commit(); - announceLevelFinished(); - return result; + return result.getResult(); } case 1: - announceNextStep(); - result = consumeAssignment$3(nextEntryPoint()); - if (result!=ConsumeResult.SUCCESS) { + result.nextStep(); + if (result.didGroupFail(consumeAssignment$3(nextEntryPoint()))) { + // TODO improve error message error("Another token expected.", getRule().ele1AssignmentName()); - marker.commit(); - announceLevelFinished(); - return result; + return result.getResult(); } } - marker.commit(); - announceLevelFinished(); - return result; + return result.getResult(); } protected int consumeKeyword$2(int entryPoint) throws Exception { 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 00eded2..c69140e 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 @@ -58,70 +58,54 @@ public final class DomainmodelEntityConsumer extends NonTerminalConsumer { } protected int consumeGroup$1(int entryPoint) throws Exception { - announceNextLevel(); - final IMarker marker = mark(); - int result = ConsumeResult.SUCCESS; + GroupResult result = createGroupResult(getRule().eleGroup()); switch(entryPoint) { case -1: // use fall through semantics of switch case - result = ConsumeResult.EMPTY_MATCH; + result.reset(); case 0: - announceNextStep(); - result = consumeKeyword$6(nextEntryPoint()); - if (result!=ConsumeResult.SUCCESS) { + result.nextStep(); + if (result.didGroupFail(consumeKeyword$6(nextEntryPoint()))) { + // TODO improve error message error("Another token expected.", getRule().ele00000KeywordEntity()); - marker.commit(); - announceLevelFinished(); - return result; + return result.getResult(); } case 1: - announceNextStep(); - result = consumeAssignment$7(nextEntryPoint()); - if (result!=ConsumeResult.SUCCESS) { + result.nextStep(); + if (result.didGroupFail(consumeAssignment$7(nextEntryPoint()))) { + // TODO improve error message error("Another token expected.", getRule().ele00001AssignmentName()); - marker.commit(); - announceLevelFinished(); - return result; + return result.getResult(); } case 2: - announceNextStep(); - result = consumeGroup$9(nextEntryPoint()); - if (result!=ConsumeResult.SUCCESS) { + result.nextStep(); + if (result.didGroupFail(consumeGroup$9(nextEntryPoint()))) { + // TODO improve error message error("Another token expected.", getRule().ele0001Group()); - marker.commit(); - announceLevelFinished(); - return result; + return result.getResult(); } case 3: - announceNextStep(); - result = consumeKeyword$14(nextEntryPoint()); - if (result!=ConsumeResult.SUCCESS) { + result.nextStep(); + if (result.didGroupFail(consumeKeyword$14(nextEntryPoint()))) { + // TODO improve error message error("Another token expected.", getRule().ele001KeywordLeftCurlyBracket()); - marker.commit(); - announceLevelFinished(); - return result; + return result.getResult(); } case 4: - announceNextStep(); - result = consumeAssignment$15(nextEntryPoint()); - if (result!=ConsumeResult.SUCCESS) { + result.nextStep(); + if (result.didGroupFail(consumeAssignment$15(nextEntryPoint()))) { + // TODO improve error message error("Another token expected.", getRule().ele01AssignmentFeatures()); - marker.commit(); - announceLevelFinished(); - return result; + return result.getResult(); } case 5: - announceNextStep(); - result = consumeKeyword$17(nextEntryPoint()); - if (result!=ConsumeResult.SUCCESS) { + result.nextStep(); + if (result.didGroupFail(consumeKeyword$17(nextEntryPoint()))) { + // TODO improve error message error("Another token expected.", getRule().ele1KeywordRightCurlyBracket()); - marker.commit(); - announceLevelFinished(); - return result; + return result.getResult(); } } - marker.commit(); - announceLevelFinished(); - return result; + return result.getResult(); } protected int consumeKeyword$6(int entryPoint) throws Exception { @@ -139,42 +123,35 @@ public final class DomainmodelEntityConsumer extends NonTerminalConsumer { protected int consumeGroup$9(int entryPoint) throws Exception { IMarker marker = mark(); int result = doConsumeGroup$9(entryPoint); - if (result != ConsumeResult.SUCCESS) + if (result != ConsumeResult.SUCCESS) { marker.rollback(); - else + skipped(getRule().ele0001Group()); + } else marker.commit(); return ConsumeResult.SUCCESS; } protected int doConsumeGroup$9(int entryPoint) throws Exception { - announceNextLevel(); - final IMarker marker = mark(); - int result = ConsumeResult.SUCCESS; + GroupResult result = createGroupResult(getRule().ele0001Group()); switch(entryPoint) { case -1: // use fall through semantics of switch case - result = ConsumeResult.EMPTY_MATCH; + result.reset(); case 0: - announceNextStep(); - result = consumeKeyword$10(nextEntryPoint()); - if (result!=ConsumeResult.SUCCESS) { + result.nextStep(); + if (result.didGroupFail(consumeKeyword$10(nextEntryPoint()))) { + // TODO improve error message error("Another token expected.", getRule().ele00010KeywordExtends()); - marker.commit(); - announceLevelFinished(); - return result; + return result.getResult(); } case 1: - announceNextStep(); - result = consumeAssignment$11(nextEntryPoint()); - if (result!=ConsumeResult.SUCCESS) { + result.nextStep(); + if (result.didGroupFail(consumeAssignment$11(nextEntryPoint()))) { + // TODO improve error message error("Another token expected.", getRule().ele00011AssignmentSuperType()); - marker.commit(); - announceLevelFinished(); - return result; + return result.getResult(); } } - marker.commit(); - announceLevelFinished(); - return result; + return result.getResult(); } protected int consumeKeyword$10(int entryPoint) throws Exception { @@ -199,6 +176,7 @@ public final class DomainmodelEntityConsumer extends NonTerminalConsumer { marker.flush(); } marker.rollback(); + skipped(getRule().ele01AssignmentFeatures()); return ConsumeResult.SUCCESS; } 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 2ed4443..26db5b7 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 @@ -40,7 +40,7 @@ public final class DomainmodelFeatureConsumer extends NonTerminalConsumer { } protected int consumeAlternatives$1(int entryPoint) throws Exception { - AlternativesResult result = createAlternativesResult(); + AlternativesResult result = createAlternativesResult(getRule().eleAlternatives()); switch(entryPoint) { case -1: // use fall through semantics of switch case result.reset(); 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 8d9e106..dad5a39 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 @@ -40,34 +40,26 @@ public final class DomainmodelFileConsumer extends NonTerminalConsumer { } protected int consumeGroup$1(int entryPoint) throws Exception { - announceNextLevel(); - final IMarker marker = mark(); - int result = ConsumeResult.SUCCESS; + GroupResult result = createGroupResult(getRule().eleGroup()); switch(entryPoint) { case -1: // use fall through semantics of switch case - result = ConsumeResult.EMPTY_MATCH; + result.reset(); case 0: - announceNextStep(); - result = consumeAssignment$2(nextEntryPoint()); - if (result!=ConsumeResult.SUCCESS) { + result.nextStep(); + if (result.didGroupFail(consumeAssignment$2(nextEntryPoint()))) { + // TODO improve error message error("Another token expected.", getRule().ele0AssignmentImports()); - marker.commit(); - announceLevelFinished(); - return result; + return result.getResult(); } case 1: - announceNextStep(); - result = consumeAssignment$4(nextEntryPoint()); - if (result!=ConsumeResult.SUCCESS) { + result.nextStep(); + if (result.didGroupFail(consumeAssignment$4(nextEntryPoint()))) { + // TODO improve error message error("Another token expected.", getRule().ele1AssignmentNamedElements()); - marker.commit(); - announceLevelFinished(); - return result; + return result.getResult(); } } - marker.commit(); - announceLevelFinished(); - return result; + return result.getResult(); } protected int consumeAssignment$2(int entryPoint) throws Exception { @@ -76,6 +68,7 @@ public final class DomainmodelFileConsumer extends NonTerminalConsumer { marker.flush(); } marker.rollback(); + skipped(getRule().ele0AssignmentImports()); return ConsumeResult.SUCCESS; } @@ -93,6 +86,7 @@ public final class DomainmodelFileConsumer extends NonTerminalConsumer { marker.flush(); } marker.rollback(); + skipped(getRule().ele1AssignmentNamedElements()); return ConsumeResult.SUCCESS; } 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 20ab0a6..d0f37cd 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 @@ -44,34 +44,26 @@ public final class DomainmodelImportConsumer extends NonTerminalConsumer { } protected int consumeGroup$1(int entryPoint) throws Exception { - announceNextLevel(); - final IMarker marker = mark(); - int result = ConsumeResult.SUCCESS; + GroupResult result = createGroupResult(getRule().eleGroup()); switch(entryPoint) { case -1: // use fall through semantics of switch case - result = ConsumeResult.EMPTY_MATCH; + result.reset(); case 0: - announceNextStep(); - result = consumeKeyword$2(nextEntryPoint()); - if (result!=ConsumeResult.SUCCESS) { + result.nextStep(); + if (result.didGroupFail(consumeKeyword$2(nextEntryPoint()))) { + // TODO improve error message error("Another token expected.", getRule().ele0KeywordImport()); - marker.commit(); - announceLevelFinished(); - return result; + return result.getResult(); } case 1: - announceNextStep(); - result = consumeAssignment$3(nextEntryPoint()); - if (result!=ConsumeResult.SUCCESS) { + result.nextStep(); + if (result.didGroupFail(consumeAssignment$3(nextEntryPoint()))) { + // TODO improve error message error("Another token expected.", getRule().ele1AssignmentImportURI()); - marker.commit(); - announceLevelFinished(); - return result; + return result.getResult(); } } - marker.commit(); - announceLevelFinished(); - return result; + return result.getResult(); } protected int consumeKeyword$2(int entryPoint) throws Exception { 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 f00d75c..a8b9293 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 @@ -40,7 +40,7 @@ public final class DomainmodelNamedElementConsumer extends NonTerminalConsumer { } protected int consumeAlternatives$1(int entryPoint) throws Exception { - AlternativesResult result = createAlternativesResult(); + AlternativesResult result = createAlternativesResult(getRule().eleAlternatives()); switch(entryPoint) { case -1: // use fall through semantics of switch case result.reset(); 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 477f02a..a7f260c 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 @@ -60,79 +60,61 @@ public final class DomainmodelOperationConsumer extends NonTerminalConsumer { } protected int consumeGroup$1(int entryPoint) throws Exception { - announceNextLevel(); - final IMarker marker = mark(); - int result = ConsumeResult.SUCCESS; + GroupResult result = createGroupResult(getRule().eleGroup()); switch(entryPoint) { case -1: // use fall through semantics of switch case - result = ConsumeResult.EMPTY_MATCH; + result.reset(); case 0: - announceNextStep(); - result = consumeKeyword$7(nextEntryPoint()); - if (result!=ConsumeResult.SUCCESS) { + result.nextStep(); + if (result.didGroupFail(consumeKeyword$7(nextEntryPoint()))) { + // TODO improve error message error("Another token expected.", getRule().ele000000KeywordOp()); - marker.commit(); - announceLevelFinished(); - return result; + return result.getResult(); } case 1: - announceNextStep(); - result = consumeAssignment$8(nextEntryPoint()); - if (result!=ConsumeResult.SUCCESS) { + result.nextStep(); + if (result.didGroupFail(consumeAssignment$8(nextEntryPoint()))) { + // TODO improve error message error("Another token expected.", getRule().ele000001AssignmentName()); - marker.commit(); - announceLevelFinished(); - return result; + return result.getResult(); } case 2: - announceNextStep(); - result = consumeKeyword$10(nextEntryPoint()); - if (result!=ConsumeResult.SUCCESS) { + result.nextStep(); + if (result.didGroupFail(consumeKeyword$10(nextEntryPoint()))) { + // TODO improve error message error("Another token expected.", getRule().ele00001KeywordLeftParenthesis()); - marker.commit(); - announceLevelFinished(); - return result; + return result.getResult(); } case 3: - announceNextStep(); - result = consumeGroup$11(nextEntryPoint()); - if (result!=ConsumeResult.SUCCESS) { + result.nextStep(); + if (result.didGroupFail(consumeGroup$11(nextEntryPoint()))) { + // TODO improve error message error("Another token expected.", getRule().ele0001Group()); - marker.commit(); - announceLevelFinished(); - return result; + return result.getResult(); } case 4: - announceNextStep(); - result = consumeKeyword$18(nextEntryPoint()); - if (result!=ConsumeResult.SUCCESS) { + result.nextStep(); + if (result.didGroupFail(consumeKeyword$18(nextEntryPoint()))) { + // TODO improve error message error("Another token expected.", getRule().ele001KeywordRightParenthesis()); - marker.commit(); - announceLevelFinished(); - return result; + return result.getResult(); } case 5: - announceNextStep(); - result = consumeKeyword$19(nextEntryPoint()); - if (result!=ConsumeResult.SUCCESS) { + result.nextStep(); + if (result.didGroupFail(consumeKeyword$19(nextEntryPoint()))) { + // TODO improve error message error("Another token expected.", getRule().ele01KeywordColon()); - marker.commit(); - announceLevelFinished(); - return result; + return result.getResult(); } case 6: - announceNextStep(); - result = consumeAssignment$20(nextEntryPoint()); - if (result!=ConsumeResult.SUCCESS) { + result.nextStep(); + if (result.didGroupFail(consumeAssignment$20(nextEntryPoint()))) { + // TODO improve error message error("Another token expected.", getRule().ele1AssignmentType()); - marker.commit(); - announceLevelFinished(); - return result; + return result.getResult(); } } - marker.commit(); - announceLevelFinished(); - return result; + return result.getResult(); } protected int consumeKeyword$7(int entryPoint) throws Exception { @@ -154,42 +136,35 @@ public final class DomainmodelOperationConsumer extends NonTerminalConsumer { protected int consumeGroup$11(int entryPoint) throws Exception { IMarker marker = mark(); int result = doConsumeGroup$11(entryPoint); - if (result != ConsumeResult.SUCCESS) + if (result != ConsumeResult.SUCCESS) { marker.rollback(); - else + skipped(getRule().ele0001Group()); + } else marker.commit(); return ConsumeResult.SUCCESS; } protected int doConsumeGroup$11(int entryPoint) throws Exception { - announceNextLevel(); - final IMarker marker = mark(); - int result = ConsumeResult.SUCCESS; + GroupResult result = createGroupResult(getRule().ele0001Group()); switch(entryPoint) { case -1: // use fall through semantics of switch case - result = ConsumeResult.EMPTY_MATCH; + result.reset(); case 0: - announceNextStep(); - result = consumeAssignment$12(nextEntryPoint()); - if (result!=ConsumeResult.SUCCESS) { + result.nextStep(); + if (result.didGroupFail(consumeAssignment$12(nextEntryPoint()))) { + // TODO improve error message error("Another token expected.", getRule().ele00010AssignmentParams()); - marker.commit(); - announceLevelFinished(); - return result; + return result.getResult(); } case 1: - announceNextStep(); - result = consumeGroup$14(nextEntryPoint()); - if (result!=ConsumeResult.SUCCESS) { + result.nextStep(); + if (result.didGroupFail(consumeGroup$14(nextEntryPoint()))) { + // TODO improve error message error("Another token expected.", getRule().ele00011Group()); - marker.commit(); - announceLevelFinished(); - return result; + return result.getResult(); } } - marker.commit(); - announceLevelFinished(); - return result; + return result.getResult(); } protected int consumeAssignment$12(int entryPoint) throws Exception { @@ -206,38 +181,31 @@ public final class DomainmodelOperationConsumer extends NonTerminalConsumer { marker.flush(); } marker.rollback(); + skipped(getRule().ele00011Group()); return ConsumeResult.SUCCESS; } protected int doConsumeGroup$14(int entryPoint) throws Exception { - announceNextLevel(); - final IMarker marker = mark(); - int result = ConsumeResult.SUCCESS; + GroupResult result = createGroupResult(getRule().ele00011Group()); switch(entryPoint) { case -1: // use fall through semantics of switch case - result = ConsumeResult.EMPTY_MATCH; + result.reset(); case 0: - announceNextStep(); - result = consumeKeyword$15(nextEntryPoint()); - if (result!=ConsumeResult.SUCCESS) { + result.nextStep(); + if (result.didGroupFail(consumeKeyword$15(nextEntryPoint()))) { + // TODO improve error message error("Another token expected.", getRule().ele000110KeywordComma()); - marker.commit(); - announceLevelFinished(); - return result; + return result.getResult(); } case 1: - announceNextStep(); - result = consumeAssignment$16(nextEntryPoint()); - if (result!=ConsumeResult.SUCCESS) { + result.nextStep(); + if (result.didGroupFail(consumeAssignment$16(nextEntryPoint()))) { + // TODO improve error message error("Another token expected.", getRule().ele000111AssignmentParams()); - marker.commit(); - announceLevelFinished(); - return result; + return result.getResult(); } } - marker.commit(); - announceLevelFinished(); - return result; + return result.getResult(); } protected int consumeKeyword$15(int entryPoint) throws Exception { 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 98ce2f9..eb707a8 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 @@ -49,61 +49,47 @@ public final class DomainmodelPackageConsumer extends NonTerminalConsumer { } protected int consumeGroup$1(int entryPoint) throws Exception { - announceNextLevel(); - final IMarker marker = mark(); - int result = ConsumeResult.SUCCESS; + GroupResult result = createGroupResult(getRule().eleGroup()); switch(entryPoint) { case -1: // use fall through semantics of switch case - result = ConsumeResult.EMPTY_MATCH; + result.reset(); case 0: - announceNextStep(); - result = consumeKeyword$5(nextEntryPoint()); - if (result!=ConsumeResult.SUCCESS) { + result.nextStep(); + if (result.didGroupFail(consumeKeyword$5(nextEntryPoint()))) { + // TODO improve error message error("Another token expected.", getRule().ele0000KeywordPackage()); - marker.commit(); - announceLevelFinished(); - return result; + return result.getResult(); } case 1: - announceNextStep(); - result = consumeAssignment$6(nextEntryPoint()); - if (result!=ConsumeResult.SUCCESS) { + result.nextStep(); + if (result.didGroupFail(consumeAssignment$6(nextEntryPoint()))) { + // TODO improve error message error("Another token expected.", getRule().ele0001AssignmentName()); - marker.commit(); - announceLevelFinished(); - return result; + return result.getResult(); } case 2: - announceNextStep(); - result = consumeKeyword$8(nextEntryPoint()); - if (result!=ConsumeResult.SUCCESS) { + result.nextStep(); + if (result.didGroupFail(consumeKeyword$8(nextEntryPoint()))) { + // TODO improve error message error("Another token expected.", getRule().ele001KeywordLeftCurlyBracket()); - marker.commit(); - announceLevelFinished(); - return result; + return result.getResult(); } case 3: - announceNextStep(); - result = consumeAssignment$9(nextEntryPoint()); - if (result!=ConsumeResult.SUCCESS) { + result.nextStep(); + if (result.didGroupFail(consumeAssignment$9(nextEntryPoint()))) { + // TODO improve error message error("Another token expected.", getRule().ele01AssignmentNamedElements()); - marker.commit(); - announceLevelFinished(); - return result; + return result.getResult(); } case 4: - announceNextStep(); - result = consumeKeyword$11(nextEntryPoint()); - if (result!=ConsumeResult.SUCCESS) { + result.nextStep(); + if (result.didGroupFail(consumeKeyword$11(nextEntryPoint()))) { + // TODO improve error message error("Another token expected.", getRule().ele1KeywordRightCurlyBracket()); - marker.commit(); - announceLevelFinished(); - return result; + return result.getResult(); } } - marker.commit(); - announceLevelFinished(); - return result; + return result.getResult(); } protected int consumeKeyword$5(int entryPoint) throws Exception { @@ -128,6 +114,7 @@ public final class DomainmodelPackageConsumer extends NonTerminalConsumer { marker.flush(); } marker.rollback(); + skipped(getRule().ele01AssignmentNamedElements()); return ConsumeResult.SUCCESS; } 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 589b0b2..1a9718d 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 @@ -43,34 +43,26 @@ public final class DomainmodelParameterConsumer extends NonTerminalConsumer { } protected int consumeGroup$1(int entryPoint) throws Exception { - announceNextLevel(); - final IMarker marker = mark(); - int result = ConsumeResult.SUCCESS; + GroupResult result = createGroupResult(getRule().eleGroup()); switch(entryPoint) { case -1: // use fall through semantics of switch case - result = ConsumeResult.EMPTY_MATCH; + result.reset(); case 0: - announceNextStep(); - result = consumeAssignment$2(nextEntryPoint()); - if (result!=ConsumeResult.SUCCESS) { + result.nextStep(); + if (result.didGroupFail(consumeAssignment$2(nextEntryPoint()))) { + // TODO improve error message error("Another token expected.", getRule().ele0AssignmentName()); - marker.commit(); - announceLevelFinished(); - return result; + return result.getResult(); } case 1: - announceNextStep(); - result = consumeAssignment$4(nextEntryPoint()); - if (result!=ConsumeResult.SUCCESS) { + result.nextStep(); + if (result.didGroupFail(consumeAssignment$4(nextEntryPoint()))) { + // TODO improve error message error("Another token expected.", getRule().ele1AssignmentType()); - marker.commit(); - announceLevelFinished(); - return result; + return result.getResult(); } } - marker.commit(); - announceLevelFinished(); - return result; + return result.getResult(); } protected int consumeAssignment$2(int entryPoint) throws Exception { 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 c79db92..eac73e1 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 @@ -47,34 +47,26 @@ public final class DomainmodelQualifiedNameConsumer extends NonTerminalConsumer } protected int consumeGroup$1(int entryPoint) throws Exception { - announceNextLevel(); - final IMarker marker = mark(); - int result = ConsumeResult.SUCCESS; + GroupResult result = createGroupResult(getRule().eleGroup()); switch(entryPoint) { case -1: // use fall through semantics of switch case - result = ConsumeResult.EMPTY_MATCH; + result.reset(); case 0: - announceNextStep(); - result = consumeRuleCall$2(nextEntryPoint()); - if (result!=ConsumeResult.SUCCESS) { + result.nextStep(); + if (result.didGroupFail(consumeRuleCall$2(nextEntryPoint()))) { + // TODO improve error message error("Another token expected.", getRule().ele0LexerRuleCallID()); - marker.commit(); - announceLevelFinished(); - return result; + return result.getResult(); } case 1: - announceNextStep(); - result = consumeGroup$3(nextEntryPoint()); - if (result!=ConsumeResult.SUCCESS) { + result.nextStep(); + if (result.didGroupFail(consumeGroup$3(nextEntryPoint()))) { + // TODO improve error message error("Another token expected.", getRule().ele1Group()); - marker.commit(); - announceLevelFinished(); - return result; + return result.getResult(); } } - marker.commit(); - announceLevelFinished(); - return result; + return result.getResult(); } protected int consumeRuleCall$2(int entryPoint) throws Exception { @@ -87,38 +79,31 @@ public final class DomainmodelQualifiedNameConsumer extends NonTerminalConsumer marker.flush(); } marker.rollback(); + skipped(getRule().ele1Group()); return ConsumeResult.SUCCESS; } protected int doConsumeGroup$3(int entryPoint) throws Exception { - announceNextLevel(); - final IMarker marker = mark(); - int result = ConsumeResult.SUCCESS; + GroupResult result = createGroupResult(getRule().ele1Group()); switch(entryPoint) { case -1: // use fall through semantics of switch case - result = ConsumeResult.EMPTY_MATCH; + result.reset(); case 0: - announceNextStep(); - result = consumeKeyword$4(nextEntryPoint()); - if (result!=ConsumeResult.SUCCESS) { + result.nextStep(); + if (result.didGroupFail(consumeKeyword$4(nextEntryPoint()))) { + // TODO improve error message error("Another token expected.", getRule().ele10KeywordFullStop()); - marker.commit(); - announceLevelFinished(); - return result; + return result.getResult(); } case 1: - announceNextStep(); - result = consumeRuleCall$5(nextEntryPoint()); - if (result!=ConsumeResult.SUCCESS) { + result.nextStep(); + if (result.didGroupFail(consumeRuleCall$5(nextEntryPoint()))) { + // TODO improve error message error("Another token expected.", getRule().ele11LexerRuleCallID()); - marker.commit(); - announceLevelFinished(); - return result; + return result.getResult(); } } - marker.commit(); - announceLevelFinished(); - return result; + return result.getResult(); } protected int consumeKeyword$4(int entryPoint) throws Exception { 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 b676209..10dd60a 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 @@ -55,61 +55,47 @@ public final class DomainmodelReferenceConsumer extends NonTerminalConsumer { } protected int consumeGroup$1(int entryPoint) throws Exception { - announceNextLevel(); - final IMarker marker = mark(); - int result = ConsumeResult.SUCCESS; + GroupResult result = createGroupResult(getRule().eleGroup()); switch(entryPoint) { case -1: // use fall through semantics of switch case - result = ConsumeResult.EMPTY_MATCH; + result.reset(); case 0: - announceNextStep(); - result = consumeKeyword$5(nextEntryPoint()); - if (result!=ConsumeResult.SUCCESS) { + result.nextStep(); + if (result.didGroupFail(consumeKeyword$5(nextEntryPoint()))) { + // TODO improve error message error("Another token expected.", getRule().ele0000KeywordRef()); - marker.commit(); - announceLevelFinished(); - return result; + return result.getResult(); } case 1: - announceNextStep(); - result = consumeAssignment$6(nextEntryPoint()); - if (result!=ConsumeResult.SUCCESS) { + result.nextStep(); + if (result.didGroupFail(consumeAssignment$6(nextEntryPoint()))) { + // TODO improve error message error("Another token expected.", getRule().ele0001AssignmentName()); - marker.commit(); - announceLevelFinished(); - return result; + return result.getResult(); } case 2: - announceNextStep(); - result = consumeKeyword$8(nextEntryPoint()); - if (result!=ConsumeResult.SUCCESS) { + result.nextStep(); + if (result.didGroupFail(consumeKeyword$8(nextEntryPoint()))) { + // TODO improve error message error("Another token expected.", getRule().ele001KeywordColon()); - marker.commit(); - announceLevelFinished(); - return result; + return result.getResult(); |