Skip to content

Commit

Permalink
upgrade to oml 2.7.1
Browse files Browse the repository at this point in the history
  • Loading branch information
@melaasar
melaasar committed Jul 17, 2024
1 parent 2befafe commit 55de1a9
Show file tree
Hide file tree
Showing 8 changed files with 1,053 additions and 1,128 deletions.
2 changes: 1 addition & 1 deletion extension/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "oml-luxor",
"displayName": "OML Luxor",
"description": "VSCode extension for OML",
"version": "2.7.0",
"version": "2.7.1",
"publisher": "openCAESAR",
"license": "Apache-2.0",
"repository": {
Expand Down
2 changes: 1 addition & 1 deletion server/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.0'
version = '2.7.1'

repositories {
mavenLocal()
Expand Down
6 changes: 3 additions & 3 deletions server/src-gen/io/opencaesar/oml/dsl/ide/contentassist/antlr/OmlParser.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -374,10 +374,10 @@ 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_0(), "rule__StructureInstance__TypeAssignment_0");
builder.put(grammarAccess.getStructureInstanceAccess().getOwnedPropertyValuesAssignment_2(), "rule__StructureInstance__OwnedPropertyValuesAssignment_2");
builder.put(grammarAccess.getStructureInstanceAccess().getTypeAssignment_1(), "rule__StructureInstance__TypeAssignment_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_3(), "rule__AnonymousRelationInstance__OwnedPropertyValuesAssignment_3");
builder.put(grammarAccess.getAnonymousRelationInstanceAccess().getOwnedPropertyValuesAssignment_2(), "rule__AnonymousRelationInstance__OwnedPropertyValuesAssignment_2");
builder.put(grammarAccess.getConceptInstanceAccess().getOwnedAnnotationsAssignment_0(), "rule__ConceptInstance__OwnedAnnotationsAssignment_0");
builder.put(grammarAccess.getConceptInstanceAccess().getNameAssignment_1_0_1(), "rule__ConceptInstance__NameAssignment_1_0_1");
builder.put(grammarAccess.getConceptInstanceAccess().getRefAssignment_1_1_2(), "rule__ConceptInstance__RefAssignment_1_1_2");
Expand Down
112 changes: 56 additions & 56 deletions server/src-gen/io/opencaesar/oml/dsl/ide/contentassist/antlr/internal/InternalOml.g
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12084,9 +12084,9 @@ rule__StructureInstance__Group__0__Impl
}
:
(
{ before(grammarAccess.getStructureInstanceAccess().getTypeAssignment_0()); }
(rule__StructureInstance__TypeAssignment_0)
{ after(grammarAccess.getStructureInstanceAccess().getTypeAssignment_0()); }
{ before(grammarAccess.getStructureInstanceAccess().getColonKeyword_0()); }
':'
{ after(grammarAccess.getStructureInstanceAccess().getColonKeyword_0()); }
)
;
finally {
Expand All @@ -12111,9 +12111,9 @@ rule__StructureInstance__Group__1__Impl
}
:
(
{ before(grammarAccess.getStructureInstanceAccess().getLeftSquareBracketKeyword_1()); }
'['
{ after(grammarAccess.getStructureInstanceAccess().getLeftSquareBracketKeyword_1()); }
{ before(grammarAccess.getStructureInstanceAccess().getTypeAssignment_1()); }
(rule__StructureInstance__TypeAssignment_1)
{ after(grammarAccess.getStructureInstanceAccess().getTypeAssignment_1()); }
)
;
finally {
Expand All @@ -12138,9 +12138,9 @@ rule__StructureInstance__Group__2__Impl
}
:
(
{ before(grammarAccess.getStructureInstanceAccess().getOwnedPropertyValuesAssignment_2()); }
(rule__StructureInstance__OwnedPropertyValuesAssignment_2)*
{ after(grammarAccess.getStructureInstanceAccess().getOwnedPropertyValuesAssignment_2()); }
{ before(grammarAccess.getStructureInstanceAccess().getLeftSquareBracketKeyword_2()); }
'['
{ after(grammarAccess.getStructureInstanceAccess().getLeftSquareBracketKeyword_2()); }
)
;
finally {
Expand All @@ -12153,6 +12153,7 @@ rule__StructureInstance__Group__3
}
:
rule__StructureInstance__Group__3__Impl
rule__StructureInstance__Group__4
;
finally {
restoreStackSize(stackSize);
Expand All @@ -12164,144 +12165,143 @@ rule__StructureInstance__Group__3__Impl
}
:
(
{ before(grammarAccess.getStructureInstanceAccess().getRightSquareBracketKeyword_3()); }
']'
{ after(grammarAccess.getStructureInstanceAccess().getRightSquareBracketKeyword_3()); }
{ before(grammarAccess.getStructureInstanceAccess().getOwnedPropertyValuesAssignment_3()); }
(rule__StructureInstance__OwnedPropertyValuesAssignment_3)*
{ after(grammarAccess.getStructureInstanceAccess().getOwnedPropertyValuesAssignment_3()); }
)
;
finally {
restoreStackSize(stackSize);
}
rule__AnonymousRelationInstance__Group__0
rule__StructureInstance__Group__4
@init {
int stackSize = keepStackSize();
}
:
rule__AnonymousRelationInstance__Group__0__Impl
rule__AnonymousRelationInstance__Group__1
rule__StructureInstance__Group__4__Impl
;
finally {
restoreStackSize(stackSize);
}
rule__AnonymousRelationInstance__Group__0__Impl
rule__StructureInstance__Group__4__Impl
@init {
int stackSize = keepStackSize();
}
:
(
{ before(grammarAccess.getAnonymousRelationInstanceAccess().getTargetAssignment_0()); }
(rule__AnonymousRelationInstance__TargetAssignment_0)
{ after(grammarAccess.getAnonymousRelationInstanceAccess().getTargetAssignment_0()); }
{ before(grammarAccess.getStructureInstanceAccess().getRightSquareBracketKeyword_4()); }
']'
{ after(grammarAccess.getStructureInstanceAccess().getRightSquareBracketKeyword_4()); }
)
;
finally {
restoreStackSize(stackSize);
}
rule__AnonymousRelationInstance__Group__1
rule__AnonymousRelationInstance__Group__0
@init {
int stackSize = keepStackSize();
}
:
rule__AnonymousRelationInstance__Group__1__Impl
rule__AnonymousRelationInstance__Group__2
rule__AnonymousRelationInstance__Group__0__Impl
rule__AnonymousRelationInstance__Group__1
;
finally {
restoreStackSize(stackSize);
}
rule__AnonymousRelationInstance__Group__1__Impl
rule__AnonymousRelationInstance__Group__0__Impl
@init {
int stackSize = keepStackSize();
}
:
(
{ before(grammarAccess.getAnonymousRelationInstanceAccess().getWithKeyword_1()); }
'with'
{ after(grammarAccess.getAnonymousRelationInstanceAccess().getWithKeyword_1()); }
{ before(grammarAccess.getAnonymousRelationInstanceAccess().getTargetAssignment_0()); }
(rule__AnonymousRelationInstance__TargetAssignment_0)
{ after(grammarAccess.getAnonymousRelationInstanceAccess().getTargetAssignment_0()); }
)
;
finally {
restoreStackSize(stackSize);
}
rule__AnonymousRelationInstance__Group__2
rule__AnonymousRelationInstance__Group__1
@init {
int stackSize = keepStackSize();
}
:
rule__AnonymousRelationInstance__Group__2__Impl
rule__AnonymousRelationInstance__Group__3
rule__AnonymousRelationInstance__Group__1__Impl
rule__AnonymousRelationInstance__Group__2
;
finally {
restoreStackSize(stackSize);
}
rule__AnonymousRelationInstance__Group__2__Impl
rule__AnonymousRelationInstance__Group__1__Impl
@init {
int stackSize = keepStackSize();
}
:
(
{ before(grammarAccess.getAnonymousRelationInstanceAccess().getLeftSquareBracketKeyword_2()); }
{ before(grammarAccess.getAnonymousRelationInstanceAccess().getLeftSquareBracketKeyword_1()); }
'['
{ after(grammarAccess.getAnonymousRelationInstanceAccess().getLeftSquareBracketKeyword_2()); }
{ after(grammarAccess.getAnonymousRelationInstanceAccess().getLeftSquareBracketKeyword_1()); }
)
;
finally {
restoreStackSize(stackSize);
}
rule__AnonymousRelationInstance__Group__3
rule__AnonymousRelationInstance__Group__2
@init {
int stackSize = keepStackSize();
}
:
rule__AnonymousRelationInstance__Group__3__Impl
rule__AnonymousRelationInstance__Group__4
rule__AnonymousRelationInstance__Group__2__Impl
rule__AnonymousRelationInstance__Group__3
;
finally {
restoreStackSize(stackSize);
}
rule__AnonymousRelationInstance__Group__3__Impl
rule__AnonymousRelationInstance__Group__2__Impl
@init {
int stackSize = keepStackSize();
}
:
(
{ before(grammarAccess.getAnonymousRelationInstanceAccess().getOwnedPropertyValuesAssignment_3()); }
(rule__AnonymousRelationInstance__OwnedPropertyValuesAssignment_3)*
{ after(grammarAccess.getAnonymousRelationInstanceAccess().getOwnedPropertyValuesAssignment_3()); }
{ before(grammarAccess.getAnonymousRelationInstanceAccess().getOwnedPropertyValuesAssignment_2()); }
(rule__AnonymousRelationInstance__OwnedPropertyValuesAssignment_2)*
{ after(grammarAccess.getAnonymousRelationInstanceAccess().getOwnedPropertyValuesAssignment_2()); }
)
;
finally {
restoreStackSize(stackSize);
}
rule__AnonymousRelationInstance__Group__4
rule__AnonymousRelationInstance__Group__3
@init {
int stackSize = keepStackSize();
}
:
rule__AnonymousRelationInstance__Group__4__Impl
rule__AnonymousRelationInstance__Group__3__Impl
;
finally {
restoreStackSize(stackSize);
}
rule__AnonymousRelationInstance__Group__4__Impl
rule__AnonymousRelationInstance__Group__3__Impl
@init {
int stackSize = keepStackSize();
}
:
(
{ before(grammarAccess.getAnonymousRelationInstanceAccess().getRightSquareBracketKeyword_4()); }
{ before(grammarAccess.getAnonymousRelationInstanceAccess().getRightSquareBracketKeyword_3()); }
']'
{ after(grammarAccess.getAnonymousRelationInstanceAccess().getRightSquareBracketKeyword_4()); }
{ after(grammarAccess.getAnonymousRelationInstanceAccess().getRightSquareBracketKeyword_3()); }
)
;
finally {
Expand Down Expand Up @@ -19185,34 +19185,34 @@ finally {
restoreStackSize(stackSize);
}
rule__StructureInstance__TypeAssignment_0
rule__StructureInstance__TypeAssignment_1
@init {
int stackSize = keepStackSize();
}
:
(
{ before(grammarAccess.getStructureInstanceAccess().getTypeStructureCrossReference_0_0()); }
{ before(grammarAccess.getStructureInstanceAccess().getTypeStructureCrossReference_1_0()); }
(
{ before(grammarAccess.getStructureInstanceAccess().getTypeStructureRefParserRuleCall_0_0_1()); }
{ before(grammarAccess.getStructureInstanceAccess().getTypeStructureRefParserRuleCall_1_0_1()); }
ruleRef
{ after(grammarAccess.getStructureInstanceAccess().getTypeStructureRefParserRuleCall_0_0_1()); }
{ after(grammarAccess.getStructureInstanceAccess().getTypeStructureRefParserRuleCall_1_0_1()); }
)
{ after(grammarAccess.getStructureInstanceAccess().getTypeStructureCrossReference_0_0()); }
{ after(grammarAccess.getStructureInstanceAccess().getTypeStructureCrossReference_1_0()); }
)
;
finally {
restoreStackSize(stackSize);
}
rule__StructureInstance__OwnedPropertyValuesAssignment_2
rule__StructureInstance__OwnedPropertyValuesAssignment_3
@init {
int stackSize = keepStackSize();
}
:
(
{ before(grammarAccess.getStructureInstanceAccess().getOwnedPropertyValuesPropertyValueAssertionParserRuleCall_2_0()); }
{ before(grammarAccess.getStructureInstanceAccess().getOwnedPropertyValuesPropertyValueAssertionParserRuleCall_3_0()); }
rulePropertyValueAssertion
{ after(grammarAccess.getStructureInstanceAccess().getOwnedPropertyValuesPropertyValueAssertionParserRuleCall_2_0()); }
{ after(grammarAccess.getStructureInstanceAccess().getOwnedPropertyValuesPropertyValueAssertionParserRuleCall_3_0()); }
)
;
finally {
Expand All @@ -19238,15 +19238,15 @@ finally {
restoreStackSize(stackSize);
}
rule__AnonymousRelationInstance__OwnedPropertyValuesAssignment_3
rule__AnonymousRelationInstance__OwnedPropertyValuesAssignment_2
@init {
int stackSize = keepStackSize();
}
:
(
{ before(grammarAccess.getAnonymousRelationInstanceAccess().getOwnedPropertyValuesPropertyValueAssertionParserRuleCall_3_0()); }
{ before(grammarAccess.getAnonymousRelationInstanceAccess().getOwnedPropertyValuesPropertyValueAssertionParserRuleCall_2_0()); }
rulePropertyValueAssertion
{ after(grammarAccess.getAnonymousRelationInstanceAccess().getOwnedPropertyValuesPropertyValueAssertionParserRuleCall_3_0()); }
{ after(grammarAccess.getAnonymousRelationInstanceAccess().getOwnedPropertyValuesPropertyValueAssertionParserRuleCall_2_0()); }
)
;
finally {
Expand Down
Loading

0 comments on commit 55de1a9

Please sign in to comment.