Skip to content

Commit cc419ce

Browse files
mps-ci-buildbotmps-ci-buildbot
authored
Merge pull request #1223 from JetBrains/merge/mps20243
Merge maintenance/mps20241 into maintenance/mps20243
2 parents c4b4a06 + cbb9f8b commit cc419ce

File tree

1 file changed

+92
-0
lines changed
  • code/grammarcells/languages/com.mbeddr.mpsutil.grammarcells/models/com/mbeddr/mpsutil/grammarcells

1 file changed

+92
-0
lines changed

‎code/grammarcells/languages/com.mbeddr.mpsutil.grammarcells/models/com/mbeddr/mpsutil/grammarcells/typesystem.mps

+92
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
<import index="tpcb" ref="r:00000000-0000-4000-0000-011c89590297(jetbrains.mps.lang.editor.behavior)" implicit="true" />
1818
<import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" implicit="true" />
1919
<import index="karh" ref="r:780bbc81-d170-48ec-b42e-89f51d5b0ee5(com.mbeddr.mpsutil.grammarcells.behavior)" implicit="true" />
20+
<import index="mhbf" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.model(MPS.OpenAPI/)" implicit="true" />
2021
</imports>
2122
<registry>
2223
<language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
@@ -42,6 +43,7 @@
4243
<concept id="1081236700937" name="jetbrains.mps.baseLanguage.structure.StaticMethodCall" flags="nn" index="2YIFZM">
4344
<reference id="1144433194310" name="classConcept" index="1Pybhc" />
4445
</concept>
46+
<concept id="1070534058343" name="jetbrains.mps.baseLanguage.structure.NullLiteral" flags="nn" index="10Nm6u" />
4547
<concept id="1070534370425" name="jetbrains.mps.baseLanguage.structure.IntegerType" flags="in" index="10Oyi0" />
4648
<concept id="1070534644030" name="jetbrains.mps.baseLanguage.structure.BooleanType" flags="in" index="10P_77" />
4749
<concept id="1068431474542" name="jetbrains.mps.baseLanguage.structure.VariableDeclaration" flags="ng" index="33uBYm">
@@ -51,20 +53,24 @@
5153
<reference id="1068581517664" name="variableDeclaration" index="3cqZAo" />
5254
</concept>
5355
<concept id="1068498886294" name="jetbrains.mps.baseLanguage.structure.AssignmentExpression" flags="nn" index="37vLTI" />
56+
<concept id="1225271221393" name="jetbrains.mps.baseLanguage.structure.NPENotEqualsExpression" flags="nn" index="17QLQc" />
5457
<concept id="1225271283259" name="jetbrains.mps.baseLanguage.structure.NPEEqualsExpression" flags="nn" index="17R0WA" />
5558
<concept id="4972933694980447171" name="jetbrains.mps.baseLanguage.structure.BaseVariableDeclaration" flags="ng" index="19Szcq">
5659
<child id="5680397130376446158" name="type" index="1tU5fm" />
5760
</concept>
61+
<concept id="1068580123152" name="jetbrains.mps.baseLanguage.structure.EqualsExpression" flags="nn" index="3clFbC" />
5862
<concept id="1068580123155" name="jetbrains.mps.baseLanguage.structure.ExpressionStatement" flags="nn" index="3clFbF">
5963
<child id="1068580123156" name="expression" index="3clFbG" />
6064
</concept>
65+
<concept id="1068580123157" name="jetbrains.mps.baseLanguage.structure.Statement" flags="nn" index="3clFbH" />
6166
<concept id="1068580123159" name="jetbrains.mps.baseLanguage.structure.IfStatement" flags="nn" index="3clFbJ">
6267
<child id="1068580123160" name="condition" index="3clFbw" />
6368
<child id="1068580123161" name="ifTrue" index="3clFbx" />
6469
</concept>
6570
<concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
6671
<child id="1068581517665" name="statement" index="3cqZAp" />
6772
</concept>
73+
<concept id="1068581242878" name="jetbrains.mps.baseLanguage.structure.ReturnStatement" flags="nn" index="3cpWs6" />
6874
<concept id="1068581242864" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclarationStatement" flags="nn" index="3cpWs8">
6975
<child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
7076
</concept>
@@ -132,6 +138,13 @@
132138
<property id="1863527487546097500" name="moduleId" index="1XweGW" />
133139
<property id="1863527487545993577" name="moduleName" index="1XxBO9" />
134140
</concept>
141+
<concept id="361130699826193248" name="jetbrains.mps.lang.modelapi.structure.ModelPointer" flags="ng" index="1dCxOl">
142+
<property id="1863527487546097494" name="modelId" index="1XweGQ" />
143+
<child id="679099339649067980" name="name" index="1j$8Uc" />
144+
</concept>
145+
<concept id="679099339649053840" name="jetbrains.mps.lang.modelapi.structure.ModelName" flags="ng" index="1j_P7g">
146+
<property id="679099339649053841" name="value" index="1j_P7h" />
147+
</concept>
135148
</language>
136149
<language id="7a5dda62-9140-4668-ab76-d5ed1746f2b2" name="jetbrains.mps.lang.typesystem">
137150
<concept id="1207055528241" name="jetbrains.mps.lang.typesystem.structure.WarningStatement" flags="nn" index="a7r0C">
@@ -195,8 +208,15 @@
195208
<child id="1144104376918" name="parameter" index="1xVPHs" />
196209
</concept>
197210
<concept id="1179409122411" name="jetbrains.mps.lang.smodel.structure.Node_ConceptMethodCall" flags="nn" index="2qgKlT" />
211+
<concept id="4065387505485742666" name="jetbrains.mps.lang.smodel.structure.ModelPointer_ResolveOperation" flags="ng" index="2yCiCJ" />
212+
<concept id="4065387505485742749" name="jetbrains.mps.lang.smodel.structure.AbstractPointerResolveOperation" flags="ng" index="2yCiFS">
213+
<child id="3648723375513868575" name="repositoryArg" index="Vysub" />
214+
</concept>
198215
<concept id="1173122760281" name="jetbrains.mps.lang.smodel.structure.Node_GetAncestorsOperation" flags="nn" index="z$bX8" />
199216
<concept id="1143234257716" name="jetbrains.mps.lang.smodel.structure.Node_GetModelOperation" flags="nn" index="I4A8Y" />
217+
<concept id="1145404486709" name="jetbrains.mps.lang.smodel.structure.SemanticDowncastExpression" flags="nn" index="2JrnkZ">
218+
<child id="1145404616321" name="leftExpression" index="2JrQYb" />
219+
</concept>
200220
<concept id="1171407110247" name="jetbrains.mps.lang.smodel.structure.Node_GetAncestorOperation" flags="nn" index="2Xjw5R" />
201221
<concept id="1678062499342629858" name="jetbrains.mps.lang.smodel.structure.ModuleRefExpression" flags="ng" index="37shsh">
202222
<child id="1678062499342629861" name="moduleId" index="37shsm" />
@@ -223,6 +243,9 @@
223243
<concept id="1138056143562" name="jetbrains.mps.lang.smodel.structure.SLinkAccess" flags="nn" index="3TrEf2">
224244
<reference id="1138056516764" name="link" index="3Tt5mk" />
225245
</concept>
246+
<concept id="1863527487546129879" name="jetbrains.mps.lang.smodel.structure.ModelPointerExpression" flags="ng" index="1Xw6AR">
247+
<child id="1863527487546132519" name="modelRef" index="1XwpL7" />
248+
</concept>
226249
</language>
227250
<language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
228251
<concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
@@ -801,5 +824,74 @@
801824
</node>
802825
</node>
803826
</node>
827+
<node concept="18kY7G" id="5$hufwY_g_w">
828+
<property role="TrG5h" value="check_GrammarCellsTransformationMenuPart" />
829+
<node concept="3clFbS" id="5$hufwY_g_x" role="18ibNy">
830+
<node concept="3clFbJ" id="5$hufwY_lKC" role="3cqZAp">
831+
<node concept="3clFbS" id="5$hufwY_lKE" role="3clFbx">
832+
<node concept="3cpWs6" id="5$hufwY_lTF" role="3cqZAp" />
833+
</node>
834+
<node concept="3clFbC" id="5$hufwY_lR6" role="3clFbw">
835+
<node concept="10Nm6u" id="5$hufwY_lR9" role="3uHU7w" />
836+
<node concept="2OqwBi" id="5$hufwY_lLQ" role="3uHU7B">
837+
<node concept="1YBJjd" id="5$hufwY_lLR" role="2Oq$k0">
838+
<ref role="1YBMHb" node="5$hufwY_g_z" resolve="grammarCellsTransformationMenuPart" />
839+
</node>
840+
<node concept="I4A8Y" id="5$hufwY_lLS" role="2OqNvi" />
841+
</node>
842+
</node>
843+
</node>
844+
<node concept="3clFbH" id="5$hufwY_lIZ" role="3cqZAp" />
845+
<node concept="3clFbJ" id="5$hufwY_jvM" role="3cqZAp">
846+
<node concept="3clFbS" id="5$hufwY_jvO" role="3clFbx">
847+
<node concept="a7r0C" id="5$hufwY_gEW" role="3cqZAp">
848+
<node concept="Xl_RD" id="5$hufwY_gF5" role="a7wSD">
849+
<property role="Xl_RC" value="This concept is not supposed to be instantiated and only for internal use. Please remove it as usage will be disallowed in the future" />
850+
</node>
851+
<node concept="1YBJjd" id="5$hufwY_gJA" role="1urrMF">
852+
<ref role="1YBMHb" node="5$hufwY_g_z" resolve="grammarCellsTransformationMenuPart" />
853+
</node>
854+
</node>
855+
</node>
856+
<node concept="17QLQc" id="5$hufwY_kim" role="3clFbw">
857+
<node concept="2OqwBi" id="5$hufwY_kzZ" role="3uHU7w">
858+
<node concept="1Xw6AR" id="5$hufwY_kiT" role="2Oq$k0">
859+
<node concept="1dCxOl" id="5$hufwY_ksq" role="1XwpL7">
860+
<property role="1XweGQ" value="r:0e2d0780-27a1-4dda-a429-65b192261fcc" />
861+
<node concept="1j_P7g" id="5$hufwY_ksr" role="1j$8Uc">
862+
<property role="1j_P7h" value="com.mbeddr.mpsutil.grammarcells.generator.template.main@generator" />
863+
</node>
864+
</node>
865+
</node>
866+
<node concept="2yCiCJ" id="5$hufwY_kEN" role="2OqNvi">
867+
<node concept="2OqwBi" id="5$hufwY_l_0" role="Vysub">
868+
<node concept="2JrnkZ" id="5$hufwY_ltG" role="2Oq$k0">
869+
<node concept="2OqwBi" id="5$hufwY_kQB" role="2JrQYb">
870+
<node concept="1YBJjd" id="5$hufwY_kFj" role="2Oq$k0">
871+
<ref role="1YBMHb" node="5$hufwY_g_z" resolve="grammarCellsTransformationMenuPart" />
872+
</node>
873+
<node concept="I4A8Y" id="5$hufwY_l4x" role="2OqNvi" />
874+
</node>
875+
</node>
876+
<node concept="liA8E" id="5$hufwY_lHT" role="2OqNvi">
877+
<ref role="37wK5l" to="mhbf:~SModel.getRepository()" resolve="getRepository" />
878+
</node>
879+
</node>
880+
</node>
881+
</node>
882+
<node concept="2OqwBi" id="5$hufwY_jEX" role="3uHU7B">
883+
<node concept="1YBJjd" id="5$hufwY_jvX" role="2Oq$k0">
884+
<ref role="1YBMHb" node="5$hufwY_g_z" resolve="grammarCellsTransformationMenuPart" />
885+
</node>
886+
<node concept="I4A8Y" id="5$hufwY_jSv" role="2OqNvi" />
887+
</node>
888+
</node>
889+
</node>
890+
</node>
891+
<node concept="1YaCAy" id="5$hufwY_g_z" role="1YuTPh">
892+
<property role="TrG5h" value="grammarCellsTransformationMenuPart" />
893+
<ref role="1YaFvo" to="teg0:1YKLYyyFscL" resolve="GrammarCellsTransformationMenuPart" />
894+
</node>
895+
</node>
804896
</model>
805897

0 commit comments

Comments
 (0)