Merge branch 'v20.x_dev' into v20.x

integrity-tf · Feb 4, 2022 · 838ef62 · 838ef62
2 parents 76d22a1 + eafcc60
commit 838ef62
Show file tree

Hide file tree

Showing 54 changed files with 8,515 additions and 6,806 deletions.
diff --git a/de.gebit.integrity.dsl.runner.experimentation/.settings/org.eclipse.jdt.core.prefs b/de.gebit.integrity.dsl.runner.experimentation/.settings/org.eclipse.jdt.core.prefs
@@ -7,7 +7,9 @@ org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore
 org.eclipse.jdt.core.compiler.release=disabled
 org.eclipse.jdt.core.compiler.source=1.8
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
@@ -752,6 +752,9 @@ public void complete_NullValue(EObject model, RuleCall ruleCall, ContentAssistCo
 	public void complete_InexistentValue(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
 		// subclasses may override
 	}
+	public void complete_EmptyValue(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+		// subclasses may override
+	}
 	public void complete_EnumValue(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
@@ -166,6 +166,7 @@ protected String getRuleName(AbstractElement element) {
 					put(grammarAccess.getVariableAccess().getGroup_1(), "rule__Variable__Group_1__0");
 					put(grammarAccess.getNullValueAccess().getGroup(), "rule__NullValue__Group__0");
 					put(grammarAccess.getInexistentValueAccess().getGroup(), "rule__InexistentValue__Group__0");
+					put(grammarAccess.getEmptyValueAccess().getGroup(), "rule__EmptyValue__Group__0");
 					put(grammarAccess.getNestedObjectAccess().getGroup(), "rule__NestedObject__Group__0");
 					put(grammarAccess.getNestedObjectAccess().getGroup_2(), "rule__NestedObject__Group_2__0");
 					put(grammarAccess.getTypedNestedObjectAccess().getGroup(), "rule__TypedNestedObject__Group__0");

diff --git a/...integrity.dsl.ui/src-gen/de/gebit/integrity/ui/contentassist/antlr/internal/InternalDSL.g b/...integrity.dsl.ui/src-gen/de/gebit/integrity/ui/contentassist/antlr/internal/InternalDSL.g
@@ -2382,6 +2382,34 @@ finally {
 
 
 
+// Entry rule entryRuleEmptyValue
+entryRuleEmptyValue 
+:
+{ before(grammarAccess.getEmptyValueRule()); }
+	 ruleEmptyValue
+{ after(grammarAccess.getEmptyValueRule()); } 
+	 EOF 
+;
+
+// Rule EmptyValue
+ruleEmptyValue
+    @init {
+		int stackSize = keepStackSize();
+    }
+	:
+(
+{ before(grammarAccess.getEmptyValueAccess().getGroup()); }
+(rule__EmptyValue__Group__0)
+{ after(grammarAccess.getEmptyValueAccess().getGroup()); }
+)
+
+;
+finally {
+	restoreStackSize(stackSize);
+}
+
+
+
 // Entry rule entryRuleEnumValue
 entryRuleEnumValue 
 :
@@ -3519,9 +3547,15 @@ rule__StaticValue__Alternatives
 )
 
     |(
-{ before(grammarAccess.getStaticValueAccess().getJavaConstantValueParserRuleCall_10()); }
+{ before(grammarAccess.getStaticValueAccess().getEmptyValueParserRuleCall_10()); }
+	ruleEmptyValue
+{ after(grammarAccess.getStaticValueAccess().getEmptyValueParserRuleCall_10()); }
+)
+
+    |(
+{ before(grammarAccess.getStaticValueAccess().getJavaConstantValueParserRuleCall_11()); }
 	ruleJavaConstantValue
-{ after(grammarAccess.getStaticValueAccess().getJavaConstantValueParserRuleCall_10()); }
+{ after(grammarAccess.getStaticValueAccess().getJavaConstantValueParserRuleCall_11()); }
 )
 
 ;
@@ -14989,6 +15023,71 @@ finally {
 
 
 
+rule__EmptyValue__Group__0
+    @init {
+		int stackSize = keepStackSize();
+    }
+:
+	rule__EmptyValue__Group__0__Impl
+	rule__EmptyValue__Group__1
+;
+finally {
+	restoreStackSize(stackSize);
+}
+
+rule__EmptyValue__Group__0__Impl
+    @init {
+		int stackSize = keepStackSize();
+    }
+:
+(
+{ before(grammarAccess.getEmptyValueAccess().getEmptyAction_0()); }
+(
+
+)
+{ after(grammarAccess.getEmptyValueAccess().getEmptyAction_0()); }
+)
+
+;
+finally {
+	restoreStackSize(stackSize);
+}
+
+
+rule__EmptyValue__Group__1
+    @init {
+		int stackSize = keepStackSize();
+    }
+:
+	rule__EmptyValue__Group__1__Impl
+;
+finally {
+	restoreStackSize(stackSize);
+}
+
+rule__EmptyValue__Group__1__Impl
+    @init {
+		int stackSize = keepStackSize();
+    }
+:
+(
+{ before(grammarAccess.getEmptyValueAccess().getEmptyKeyword_1()); }
+
+	'empty' 
+
+{ after(grammarAccess.getEmptyValueAccess().getEmptyKeyword_1()); }
+)
+
+;
+finally {
+	restoreStackSize(stackSize);
+}
+
+
+
+
+
+
 rule__NestedObject__Group__0
     @init {
 		int stackSize = keepStackSize();

diff --git a/...rity.dsl.ui/src-gen/de/gebit/integrity/ui/contentassist/antlr/internal/InternalDSL.tokens b/...rity.dsl.ui/src-gen/de/gebit/integrity/ui/contentassist/antlr/internal/InternalDSL.tokens
@@ -7,8 +7,8 @@
 ','=70
 '-'=33
 '->'=61
-'.'=83
-'.*'=84
+'.'=84
+'.*'=85
 '..'=37
 '/'=35
 ':'=45
@@ -22,29 +22,30 @@
 'by default'=55
 'call'=67
 'calldef'=48
-'checkpoint'=89
+'checkpoint'=90
 'concludedby'=54
 'constant'=59
+'empty'=81
 'forkdef'=42
 'gets'=51
 'import'=41
 'in'=62
 'inexistent'=80
 'initially'=58
-'inlined'=87
-'live'=90
-'master'=92
+'inlined'=88
+'live'=91
+'master'=93
 'null'=79
 'on'=69
 'operationdef'=56
 'packagedef'=38
 'packageend'=40
-'parameterized'=88
-'private'=85
-'progressing'=91
+'parameterized'=89
+'private'=86
+'progressing'=92
 'requires'=53
 'returns'=52
-'single-run'=86
+'single-run'=87
 'suite'=71
 'suitedef'=49
 'suiteend'=50
@@ -56,9 +57,9 @@
 'variable'=57
 'variantdef'=46
 'with'=39
-'{'=81
+'{'=82
 '|'=66
-'}'=82
+'}'=83
 RULE_ANY_OTHER=31
 RULE_BOOLEAN_FALSE=5
 RULE_BOOLEAN_TRUE=4
@@ -148,3 +149,4 @@ T__89=89
 T__90=90
 T__91=91
 T__92=92
+T__93=93