changed grammar so we don't get additional keywords with issue #206 impl

integrity-tf · Jan 3, 2019 · 1944fbd · 1944fbd
1 parent f9ea973
commit 1944fbd
Show file tree

Hide file tree

Showing 31 changed files with 10,724 additions and 14,341 deletions.
diff --git a/de.gebit.integrity.dsl.experimentation/src/folder/simple.integrity b/de.gebit.integrity.dsl.experimentation/src/folder/simple.integrity
@@ -80,7 +80,7 @@ packagedef mypackage with
 		// Resets date/time on all forks and the master to live system date/time
 		timeset live
 
-		timeset + 12 minutes on master
+		timeset + 12minutes on master
 
 
 		suite bsuite on fork1
@@ -96,7 +96,7 @@ packagedef mypackage with
 		timeset 10.02.2001 on fork1
 		timeset 10.03.2001 on master
 
-		timeset + 1 months
+		timeset + 1months
 
 		suite csuite on fork1
 

diff --git a/...grity.dsl.ui/src-gen/de/gebit/integrity/ui/contentassist/AbstractDSLProposalProvider.java b/...grity.dsl.ui/src-gen/de/gebit/integrity/ui/contentassist/AbstractDSLProposalProvider.java
@@ -296,32 +296,6 @@ public void completeTimeDifference_Direction(EObject model, Assignment assignmen
 	public void completeTimeDifference_Values(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
 		completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
 	}
-	public void completeTimeDifferencePart_Value(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
-	}
-	public void completeTimeDifferencePart_TemporalUnit(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		// subclasses may override
-		// subclasses may override
-		// subclasses may override
-		// subclasses may override
-		// subclasses may override
-		// subclasses may override
-		// subclasses may override
-		// subclasses may override
-		// subclasses may override
-		// subclasses may override
-		// subclasses may override
-		// subclasses may override
-		// subclasses may override
-		// subclasses may override
-		// subclasses may override
-		// subclasses may override
-		// subclasses may override
-		// subclasses may override
-		// subclasses may override
-		// subclasses may override
-		// subclasses may override
-	}
 	public void completeSuite_Inlined(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
 		// subclasses may override
 	}
@@ -644,9 +618,6 @@ public void complete_TimeSet(EObject model, RuleCall ruleCall, ContentAssistCont
 	public void complete_TimeDifference(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
 		// subclasses may override
 	}
-	public void complete_TimeDifferencePart(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		// subclasses may override
-	}
 	public void complete_Suite(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
 		// subclasses may override
 	}
@@ -872,6 +843,9 @@ public void complete_TWENTYFOURHRSTIME(EObject model, RuleCall ruleCall, Content
 	public void complete_TWELVEHRSTIME(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
 		// subclasses may override
 	}
+	public void complete_TIMESPAN(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+		// subclasses may override
+	}
 	public void complete_ANY_OTHER(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
 		// subclasses may override
 	}

diff --git a/de.gebit.integrity.dsl.ui/src-gen/de/gebit/integrity/ui/contentassist/antlr/DSLParser.java b/de.gebit.integrity.dsl.ui/src-gen/de/gebit/integrity/ui/contentassist/antlr/DSLParser.java
@@ -51,7 +51,6 @@ protected String getRuleName(AbstractElement element) {
 					put(grammarAccess.getTimeSetAccess().getAlternatives_2_1_0(), "rule__TimeSet__Alternatives_2_1_0");
 					put(grammarAccess.getTimeSetAccess().getAlternatives_3_2_0(), "rule__TimeSet__Alternatives_3_2_0");
 					put(grammarAccess.getTimeDifferenceAccess().getDirectionAlternatives_0_0(), "rule__TimeDifference__DirectionAlternatives_0_0");
-					put(grammarAccess.getTimeDifferencePartAccess().getTemporalUnitAlternatives_2_0(), "rule__TimeDifferencePart__TemporalUnitAlternatives_2_0");
 					put(grammarAccess.getParameterNameAccess().getAlternatives(), "rule__ParameterName__Alternatives");
 					put(grammarAccess.getArbitraryParameterOrResultNameAccess().getAlternatives_1(), "rule__ArbitraryParameterOrResultName__Alternatives_1");
 					put(grammarAccess.getOperationAccess().getAlternatives(), "rule__Operation__Alternatives");
@@ -135,7 +134,6 @@ protected String getRuleName(AbstractElement element) {
 					put(grammarAccess.getTimeSetAccess().getGroup_3_2(), "rule__TimeSet__Group_3_2__0");
 					put(grammarAccess.getTimeDifferenceAccess().getGroup(), "rule__TimeDifference__Group__0");
 					put(grammarAccess.getTimeDifferenceAccess().getGroup_1(), "rule__TimeDifference__Group_1__0");
-					put(grammarAccess.getTimeDifferencePartAccess().getGroup(), "rule__TimeDifferencePart__Group__0");
 					put(grammarAccess.getSuiteAccess().getGroup(), "rule__Suite__Group__0");
 					put(grammarAccess.getSuiteAccess().getGroup_3(), "rule__Suite__Group_3__0");
 					put(grammarAccess.getSuiteAccess().getGroup_6(), "rule__Suite__Group_6__0");
@@ -269,8 +267,6 @@ protected String getRuleName(AbstractElement element) {
 					put(grammarAccess.getTimeSetAccess().getMasterForkAssignment_3_2_0_1(), "rule__TimeSet__MasterForkAssignment_3_2_0_1");
 					put(grammarAccess.getTimeDifferenceAccess().getDirectionAssignment_0(), "rule__TimeDifference__DirectionAssignment_0");
 					put(grammarAccess.getTimeDifferenceAccess().getValuesAssignment_1_1(), "rule__TimeDifference__ValuesAssignment_1_1");
-					put(grammarAccess.getTimeDifferencePartAccess().getValueAssignment_0(), "rule__TimeDifferencePart__ValueAssignment_0");
-					put(grammarAccess.getTimeDifferencePartAccess().getTemporalUnitAssignment_2(), "rule__TimeDifferencePart__TemporalUnitAssignment_2");
 					put(grammarAccess.getSuiteAccess().getInlinedAssignment_0(), "rule__Suite__InlinedAssignment_0");
 					put(grammarAccess.getSuiteAccess().getMultiplierAssignment_3_0(), "rule__Suite__MultiplierAssignment_3_0");
 					put(grammarAccess.getSuiteAccess().getDefinitionAssignment_4(), "rule__Suite__DefinitionAssignment_4");