Skip to content

Commit 24575e4

Browse files
author
Alexander Pann
authored
Merge pull request #2837 from mbeddr/bugfix/fix_docdescriptor_check
doc.aspect: improve the new aspect descriptor check
2 parents 9530293 + e46d0c1 commit 24575e4

File tree

1 file changed

+81
-16
lines changed
  • code/languages/com.mbeddr.doc.aspect/languages/com.mbeddr.doc.aspect/models/com/mbeddr/doc/aspect

1 file changed

+81
-16
lines changed

‎code/languages/com.mbeddr.doc.aspect/languages/com.mbeddr.doc.aspect/models/com/mbeddr/doc/aspect/typesystem.mps

Lines changed: 81 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,17 @@
1111
<import index="2c95" ref="r:5f7188a9-e7b4-4a2e-bef9-38d2cf379fdc(com.mbeddr.doc.structure)" />
1212
<import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" />
1313
<import index="748g" ref="r:85fc9553-7d9a-4019-83cc-9f8169da83fb(com.mbeddr.doc.aspect.structure)" />
14+
<import index="w1kc" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.smodel(MPS.Core/)" />
15+
<import index="mhbf" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.model(MPS.OpenAPI/)" implicit="true" />
1416
</imports>
1517
<registry>
1618
<language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
19+
<concept id="1080223426719" name="jetbrains.mps.baseLanguage.structure.OrExpression" flags="nn" index="22lmx$" />
1720
<concept id="1215693861676" name="jetbrains.mps.baseLanguage.structure.BaseAssignmentExpression" flags="nn" index="d038R">
1821
<child id="1068498886297" name="rValue" index="37vLTx" />
1922
<child id="1068498886295" name="lValue" index="37vLTJ" />
2023
</concept>
24+
<concept id="1202948039474" name="jetbrains.mps.baseLanguage.structure.InstanceMethodCallOperation" flags="nn" index="liA8E" />
2125
<concept id="1197027756228" name="jetbrains.mps.baseLanguage.structure.DotExpression" flags="nn" index="2OqwBi">
2226
<child id="1197027771414" name="operand" index="2Oq$k0" />
2327
<child id="1197027833540" name="operation" index="2OqNvi" />
@@ -28,6 +32,11 @@
2832
<concept id="1070475926800" name="jetbrains.mps.baseLanguage.structure.StringLiteral" flags="nn" index="Xl_RD">
2933
<property id="1070475926801" name="value" index="Xl_RC" />
3034
</concept>
35+
<concept id="1081256982272" name="jetbrains.mps.baseLanguage.structure.InstanceOfExpression" flags="nn" index="2ZW3vV">
36+
<child id="1081256993305" name="classType" index="2ZW6by" />
37+
<child id="1081256993304" name="leftExpression" index="2ZW6bz" />
38+
</concept>
39+
<concept id="1070534058343" name="jetbrains.mps.baseLanguage.structure.NullLiteral" flags="nn" index="10Nm6u" />
3140
<concept id="1068431474542" name="jetbrains.mps.baseLanguage.structure.VariableDeclaration" flags="ng" index="33uBYm">
3241
<child id="1068431790190" name="initializer" index="33vP2m" />
3342
</concept>
@@ -38,6 +47,7 @@
3847
<concept id="4972933694980447171" name="jetbrains.mps.baseLanguage.structure.BaseVariableDeclaration" flags="ng" index="19Szcq">
3948
<child id="5680397130376446158" name="type" index="1tU5fm" />
4049
</concept>
50+
<concept id="1068580123152" name="jetbrains.mps.baseLanguage.structure.EqualsExpression" flags="nn" index="3clFbC" />
4151
<concept id="1068580123155" name="jetbrains.mps.baseLanguage.structure.ExpressionStatement" flags="nn" index="3clFbF">
4252
<child id="1068580123156" name="expression" index="3clFbG" />
4353
</concept>
@@ -54,9 +64,22 @@
5464
<child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
5565
</concept>
5666
<concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
67+
<concept id="1079359253375" name="jetbrains.mps.baseLanguage.structure.ParenthesizedExpression" flags="nn" index="1eOMI4">
68+
<child id="1079359253376" name="expression" index="1eOMHV" />
69+
</concept>
5770
<concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
5871
<child id="1081516765348" name="expression" index="3fr31v" />
5972
</concept>
73+
<concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
74+
<reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
75+
</concept>
76+
<concept id="1107535904670" name="jetbrains.mps.baseLanguage.structure.ClassifierType" flags="in" index="3uibUv">
77+
<reference id="1107535924139" name="classifier" index="3uigEE" />
78+
</concept>
79+
<concept id="1081773326031" name="jetbrains.mps.baseLanguage.structure.BinaryOperation" flags="nn" index="3uHJSO">
80+
<child id="1081773367579" name="rightExpression" index="3uHU7w" />
81+
<child id="1081773367580" name="leftExpression" index="3uHU7B" />
82+
</concept>
6083
</language>
6184
<language id="69b8a993-9b87-4d96-bf0c-3559f4bb0c63" name="jetbrains.mps.lang.slanguage">
6285
<concept id="2030416617761226491" name="jetbrains.mps.lang.slanguage.structure.Model_IsAspectOperation" flags="nn" index="3zA4fs">
@@ -143,7 +166,13 @@
143166
<child id="1144104376918" name="parameter" index="1xVPHs" />
144167
</concept>
145168
<concept id="1143234257716" name="jetbrains.mps.lang.smodel.structure.Node_GetModelOperation" flags="nn" index="I4A8Y" />
169+
<concept id="1145404486709" name="jetbrains.mps.lang.smodel.structure.SemanticDowncastExpression" flags="nn" index="2JrnkZ">
170+
<child id="1145404616321" name="leftExpression" index="2JrQYb" />
171+
</concept>
146172
<concept id="1171305280644" name="jetbrains.mps.lang.smodel.structure.Node_GetDescendantsOperation" flags="nn" index="2Rf3mk" />
173+
<concept id="1171323947159" name="jetbrains.mps.lang.smodel.structure.Model_NodesOperation" flags="nn" index="2SmgA7">
174+
<child id="1758937410080001570" name="conceptArgument" index="1dBWTz" />
175+
</concept>
147176
<concept id="1171999116870" name="jetbrains.mps.lang.smodel.structure.Node_IsNullOperation" flags="nn" index="3w_OXm" />
148177
<concept id="1144101972840" name="jetbrains.mps.lang.smodel.structure.OperationParm_Concept" flags="ng" index="1xMEDy">
149178
<child id="1207343664468" name="conceptArgument" index="ri$Ld" />
@@ -179,16 +208,51 @@
179208
<property role="TrG5h" value="check_AspectDescriptorGenerated" />
180209
<node concept="3clFbS" id="2EBF2KHlovi" role="18ibNy">
181210
<node concept="3clFbJ" id="2EBF2KHlovv" role="3cqZAp">
182-
<node concept="3fqX7Q" id="2EBF2KHlq6t" role="3clFbw">
183-
<node concept="2OqwBi" id="2EBF2KHlq6v" role="3fr31v">
184-
<node concept="2OqwBi" id="2EBF2KHlq6w" role="2Oq$k0">
185-
<node concept="1YBJjd" id="2EBF2KHlq6x" role="2Oq$k0">
186-
<ref role="1YBMHb" node="2EBF2KHlovk" resolve="document" />
211+
<node concept="22lmx$" id="7JeEvf05lQ$" role="3clFbw">
212+
<node concept="22lmx$" id="7JeEvf05nNM" role="3uHU7B">
213+
<node concept="3clFbC" id="7JeEvf05oZu" role="3uHU7B">
214+
<node concept="10Nm6u" id="7JeEvf05p6L" role="3uHU7w" />
215+
<node concept="2OqwBi" id="7JeEvf05ofB" role="3uHU7B">
216+
<node concept="1YBJjd" id="7JeEvf05nUj" role="2Oq$k0">
217+
<ref role="1YBMHb" node="2EBF2KHlovk" resolve="document" />
218+
</node>
219+
<node concept="I4A8Y" id="7JeEvf05oOb" role="2OqNvi" />
220+
</node>
221+
</node>
222+
<node concept="3fqX7Q" id="7JeEvf05lNV" role="3uHU7w">
223+
<node concept="1eOMI4" id="7JeEvf05lNX" role="3fr31v">
224+
<node concept="2ZW3vV" id="7JeEvf05lNY" role="1eOMHV">
225+
<node concept="3uibUv" id="7JeEvf05lNZ" role="2ZW6by">
226+
<ref role="3uigEE" to="w1kc:~Language" resolve="Language" />
227+
</node>
228+
<node concept="2OqwBi" id="7JeEvf05lO0" role="2ZW6bz">
229+
<node concept="2JrnkZ" id="7JeEvf05lO1" role="2Oq$k0">
230+
<node concept="2OqwBi" id="7JeEvf05lO2" role="2JrQYb">
231+
<node concept="1YBJjd" id="7JeEvf05lO3" role="2Oq$k0">
232+
<ref role="1YBMHb" node="2EBF2KHlovk" resolve="document" />
233+
</node>
234+
<node concept="I4A8Y" id="7JeEvf05lO4" role="2OqNvi" />
235+
</node>
236+
</node>
237+
<node concept="liA8E" id="7JeEvf05lO5" role="2OqNvi">
238+
<ref role="37wK5l" to="mhbf:~SModel.getModule()" resolve="getModule" />
239+
</node>
240+
</node>
241+
</node>
187242
</node>
188-
<node concept="I4A8Y" id="2EBF2KHlq6y" role="2OqNvi" />
189243
</node>
190-
<node concept="3zA4fs" id="2EBF2KHlq6z" role="2OqNvi">
191-
<ref role="3zA4av" to="pgte:70oIz4aiOJd" resolve="documentation" />
244+
</node>
245+
<node concept="3fqX7Q" id="2EBF2KHlq6t" role="3uHU7w">
246+
<node concept="2OqwBi" id="2EBF2KHlq6v" role="3fr31v">
247+
<node concept="2OqwBi" id="2EBF2KHlq6w" role="2Oq$k0">
248+
<node concept="1YBJjd" id="2EBF2KHlq6x" role="2Oq$k0">
249+
<ref role="1YBMHb" node="2EBF2KHlovk" resolve="document" />
250+
</node>
251+
<node concept="I4A8Y" id="2EBF2KHlq6y" role="2OqNvi" />
252+
</node>
253+
<node concept="3zA4fs" id="2EBF2KHlq6z" role="2OqNvi">
254+
<ref role="3zA4av" to="pgte:70oIz4aiOJd" resolve="documentation" />
255+
</node>
192256
</node>
193257
</node>
194258
</node>
@@ -218,15 +282,16 @@
218282
</node>
219283
</node>
220284
<node concept="2OqwBi" id="2EBF2KHlrhj" role="3clFbw">
221-
<node concept="2OqwBi" id="2EBF2KHlqrE" role="2Oq$k0">
222-
<node concept="1YBJjd" id="2EBF2KHlq7l" role="2Oq$k0">
223-
<ref role="1YBMHb" node="2EBF2KHlovk" resolve="document" />
285+
<node concept="2OqwBi" id="7JeEvf057Wc" role="2Oq$k0">
286+
<node concept="2OqwBi" id="7JeEvf055zq" role="2Oq$k0">
287+
<node concept="1YBJjd" id="2EBF2KHlq7l" role="2Oq$k0">
288+
<ref role="1YBMHb" node="2EBF2KHlovk" resolve="document" />
289+
</node>
290+
<node concept="I4A8Y" id="7JeEvf057O3" role="2OqNvi" />
224291
</node>
225-
<node concept="2Rf3mk" id="2EBF2KHnlfI" role="2OqNvi">
226-
<node concept="1xMEDy" id="2EBF2KHnlfK" role="1xVPHs">
227-
<node concept="chp4Y" id="2EBF2KHnlfL" role="ri$Ld">
228-
<ref role="cht4Q" to="748g:UK_oBp_UIu" resolve="DocumentedConceptAnnotation" />
229-
</node>
292+
<node concept="2SmgA7" id="7JeEvf0584p" role="2OqNvi">
293+
<node concept="chp4Y" id="7JeEvf05869" role="1dBWTz">
294+
<ref role="cht4Q" to="748g:UK_oBp_UIu" resolve="DocumentedConceptAnnotation" />
230295
</node>
231296
</node>
232297
</node>

0 commit comments

Comments
 (0)