upgrade to oml 2.7.3

opencaesar · Jul 24, 2024 · 07dffe9 · 07dffe9
1 parent 9ebfbf3
commit 07dffe9
Show file tree

Hide file tree

Showing 8 changed files with 3,894 additions and 3,671 deletions.
diff --git a/extension/package.json b/extension/package.json
@@ -2,7 +2,7 @@
     "name": "oml-luxor",
     "displayName": "OML Luxor",
     "description": "VSCode extension for OML",
-    "version": "2.7.2",
+    "version": "2.7.3",
     "publisher": "openCAESAR",
     "license": "Apache-2.0",
     "repository": {

diff --git a/server/build.gradle b/server/build.gradle
@@ -12,7 +12,7 @@ apply from: "${rootDir}/gradle/source-layout.gradle"
 ext.title = 'Oml Language Server'
 description = 'IDE support for Oml Language Server'
 group = 'io.opencaesar.oml'
-version = '2.7.2'
+version = '2.7.3'
 
 repositories {
 	mavenLocal()

diff --git a/server/src-gen/io/opencaesar/oml/dsl/ide/contentassist/antlr/OmlParser.java b/server/src-gen/io/opencaesar/oml/dsl/ide/contentassist/antlr/OmlParser.java
@@ -196,6 +196,7 @@ private static void init(ImmutableMap.Builder<AbstractElement, String> builder,
 			builder.put(grammarAccess.getBuiltInAccess().getGroup_1_0(), "rule__BuiltIn__Group_1_0__0");
 			builder.put(grammarAccess.getBuiltInAccess().getGroup_1_1(), "rule__BuiltIn__Group_1_1__0");
 			builder.put(grammarAccess.getStructureInstanceAccess().getGroup(), "rule__StructureInstance__Group__0");
+			builder.put(grammarAccess.getStructureInstanceAccess().getGroup_1(), "rule__StructureInstance__Group_1__0");
 			builder.put(grammarAccess.getAnonymousRelationInstanceAccess().getGroup(), "rule__AnonymousRelationInstance__Group__0");
 			builder.put(grammarAccess.getConceptInstanceAccess().getGroup(), "rule__ConceptInstance__Group__0");
 			builder.put(grammarAccess.getConceptInstanceAccess().getGroup_1_0(), "rule__ConceptInstance__Group_1_0__0");
@@ -374,7 +375,7 @@ private static void init(ImmutableMap.Builder<AbstractElement, String> builder,
 			builder.put(grammarAccess.getBuiltInAccess().getOwnedAnnotationsAssignment_0(), "rule__BuiltIn__OwnedAnnotationsAssignment_0");
 			builder.put(grammarAccess.getBuiltInAccess().getNameAssignment_1_0_1(), "rule__BuiltIn__NameAssignment_1_0_1");
 			builder.put(grammarAccess.getBuiltInAccess().getRefAssignment_1_1_2(), "rule__BuiltIn__RefAssignment_1_1_2");
-			builder.put(grammarAccess.getStructureInstanceAccess().getTypeAssignment_1(), "rule__StructureInstance__TypeAssignment_1");
+			builder.put(grammarAccess.getStructureInstanceAccess().getTypeAssignment_1_1(), "rule__StructureInstance__TypeAssignment_1_1");
 			builder.put(grammarAccess.getStructureInstanceAccess().getOwnedPropertyValuesAssignment_3(), "rule__StructureInstance__OwnedPropertyValuesAssignment_3");
 			builder.put(grammarAccess.getAnonymousRelationInstanceAccess().getTargetAssignment_0(), "rule__AnonymousRelationInstance__TargetAssignment_0");
 			builder.put(grammarAccess.getAnonymousRelationInstanceAccess().getOwnedPropertyValuesAssignment_2(), "rule__AnonymousRelationInstance__OwnedPropertyValuesAssignment_2");

diff --git a/server/src-gen/io/opencaesar/oml/dsl/ide/contentassist/antlr/internal/InternalOml.g b/server/src-gen/io/opencaesar/oml/dsl/ide/contentassist/antlr/internal/InternalOml.g
@@ -12084,9 +12084,9 @@ rule__StructureInstance__Group__0__Impl
 	}
 :
 (
-	{ before(grammarAccess.getStructureInstanceAccess().getColonKeyword_0()); }
-	':'
-	{ after(grammarAccess.getStructureInstanceAccess().getColonKeyword_0()); }
+	{ before(grammarAccess.getStructureInstanceAccess().getStructureInstanceAction_0()); }
+	()
+	{ after(grammarAccess.getStructureInstanceAccess().getStructureInstanceAction_0()); }
 )
 ;
 finally {
@@ -12111,9 +12111,9 @@ rule__StructureInstance__Group__1__Impl
 	}
 :
 (
-	{ before(grammarAccess.getStructureInstanceAccess().getTypeAssignment_1()); }
-	(rule__StructureInstance__TypeAssignment_1)
-	{ after(grammarAccess.getStructureInstanceAccess().getTypeAssignment_1()); }
+	{ before(grammarAccess.getStructureInstanceAccess().getGroup_1()); }
+	(rule__StructureInstance__Group_1__0)?
+	{ after(grammarAccess.getStructureInstanceAccess().getGroup_1()); }
 )
 ;
 finally {
@@ -12201,6 +12201,60 @@ finally {
 }
 
 
+rule__StructureInstance__Group_1__0
+	@init {
+		int stackSize = keepStackSize();
+	}
+:
+	rule__StructureInstance__Group_1__0__Impl
+	rule__StructureInstance__Group_1__1
+;
+finally {
+	restoreStackSize(stackSize);
+}
+
+rule__StructureInstance__Group_1__0__Impl
+	@init {
+		int stackSize = keepStackSize();
+	}
+:
+(
+	{ before(grammarAccess.getStructureInstanceAccess().getColonKeyword_1_0()); }
+	':'
+	{ after(grammarAccess.getStructureInstanceAccess().getColonKeyword_1_0()); }
+)
+;
+finally {
+	restoreStackSize(stackSize);
+}
+
+rule__StructureInstance__Group_1__1
+	@init {
+		int stackSize = keepStackSize();
+	}
+:
+	rule__StructureInstance__Group_1__1__Impl
+;
+finally {
+	restoreStackSize(stackSize);
+}
+
+rule__StructureInstance__Group_1__1__Impl
+	@init {
+		int stackSize = keepStackSize();
+	}
+:
+(
+	{ before(grammarAccess.getStructureInstanceAccess().getTypeAssignment_1_1()); }
+	(rule__StructureInstance__TypeAssignment_1_1)
+	{ after(grammarAccess.getStructureInstanceAccess().getTypeAssignment_1_1()); }
+)
+;
+finally {
+	restoreStackSize(stackSize);
+}
+
+
 rule__AnonymousRelationInstance__Group__0
 	@init {
 		int stackSize = keepStackSize();
@@ -19185,19 +19239,19 @@ finally {
 	restoreStackSize(stackSize);
 }
 
-rule__StructureInstance__TypeAssignment_1
+rule__StructureInstance__TypeAssignment_1_1
 	@init {
 		int stackSize = keepStackSize();
 	}
 :
 	(
-		{ before(grammarAccess.getStructureInstanceAccess().getTypeStructureCrossReference_1_0()); }
+		{ before(grammarAccess.getStructureInstanceAccess().getTypeStructureCrossReference_1_1_0()); }
 		(
-			{ before(grammarAccess.getStructureInstanceAccess().getTypeStructureRefParserRuleCall_1_0_1()); }
+			{ before(grammarAccess.getStructureInstanceAccess().getTypeStructureRefParserRuleCall_1_1_0_1()); }
 			ruleRef
-			{ after(grammarAccess.getStructureInstanceAccess().getTypeStructureRefParserRuleCall_1_0_1()); }
+			{ after(grammarAccess.getStructureInstanceAccess().getTypeStructureRefParserRuleCall_1_1_0_1()); }
 		)
-		{ after(grammarAccess.getStructureInstanceAccess().getTypeStructureCrossReference_1_0()); }
+		{ after(grammarAccess.getStructureInstanceAccess().getTypeStructureCrossReference_1_1_0()); }
 	)
 ;
 finally {