Skip to content

Commit 829da06

Browse files
author
Alexander Pann
authored
Merge pull request #1192 from IETS3/bugfix/node_factory_nullpointer
2 parents e31c5d6 + 7d4c374 commit 829da06

File tree

1 file changed

+29
-17
lines changed

1 file changed

+29
-17
lines changed

‎code/languages/org.iets3.opensource/languages/org.iets3.core.base/models/org.iets3.core.base.actions.mps‎

Lines changed: 29 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,6 @@
1414
</imports>
1515
<registry>
1616
<language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
17-
<concept id="1082485599095" name="jetbrains.mps.baseLanguage.structure.BlockStatement" flags="nn" index="9aQIb">
18-
<child id="1082485599096" name="statements" index="9aQI4" />
19-
</concept>
2017
<concept id="1215693861676" name="jetbrains.mps.baseLanguage.structure.BaseAssignmentExpression" flags="nn" index="d038R">
2118
<child id="1068498886297" name="rValue" index="37vLTx" />
2219
<child id="1068498886295" name="lValue" index="37vLTJ" />
@@ -34,11 +31,15 @@
3431
<property id="1070475926801" name="value" index="Xl_RC" />
3532
</concept>
3633
<concept id="1070534644030" name="jetbrains.mps.baseLanguage.structure.BooleanType" flags="in" index="10P_77" />
34+
<concept id="1068431474542" name="jetbrains.mps.baseLanguage.structure.VariableDeclaration" flags="ng" index="33uBYm">
35+
<child id="1068431790190" name="initializer" index="33vP2m" />
36+
</concept>
3737
<concept id="1068498886296" name="jetbrains.mps.baseLanguage.structure.VariableReference" flags="nn" index="37vLTw">
3838
<reference id="1068581517664" name="variableDeclaration" index="3cqZAo" />
3939
</concept>
4040
<concept id="1068498886294" name="jetbrains.mps.baseLanguage.structure.AssignmentExpression" flags="nn" index="37vLTI" />
4141
<concept id="1225271369338" name="jetbrains.mps.baseLanguage.structure.IsEmptyOperation" flags="nn" index="17RlXB" />
42+
<concept id="1225271408483" name="jetbrains.mps.baseLanguage.structure.IsNotEmptyOperation" flags="nn" index="17RvpY" />
4243
<concept id="4972933694980447171" name="jetbrains.mps.baseLanguage.structure.BaseVariableDeclaration" flags="ng" index="19Szcq">
4344
<child id="5680397130376446158" name="type" index="1tU5fm" />
4445
</concept>
@@ -47,7 +48,6 @@
4748
</concept>
4849
<concept id="1068580123157" name="jetbrains.mps.baseLanguage.structure.Statement" flags="nn" index="3clFbH" />
4950
<concept id="1068580123159" name="jetbrains.mps.baseLanguage.structure.IfStatement" flags="nn" index="3clFbJ">
50-
<child id="1082485599094" name="ifFalseStatement" index="9aQIa" />
5151
<child id="1068580123160" name="condition" index="3clFbw" />
5252
<child id="1068580123161" name="ifTrue" index="3clFbx" />
5353
<child id="1206060520071" name="elsifClauses" index="3eNLev" />
@@ -232,6 +232,7 @@
232232
<node concept="3cpWsn" id="1ikTdkVOWLv" role="3cpWs9">
233233
<property role="TrG5h" value="isValid" />
234234
<node concept="10P_77" id="1ikTdkVOWLq" role="1tU5fm" />
235+
<node concept="3clFbT" id="2rCuelUFIm5" role="33vP2m" />
235236
</node>
236237
</node>
237238
<node concept="3clFbJ" id="Wg8ptqSB06" role="3cqZAp">
@@ -299,25 +300,25 @@
299300
</node>
300301
</node>
301302
</node>
302-
<node concept="9aQIb" id="1ikTdkVP5OB" role="9aQIa">
303-
<node concept="3clFbS" id="1ikTdkVP5OC" role="9aQI4">
304-
<node concept="3clFbF" id="1ikTdkVP5RV" role="3cqZAp">
305-
<node concept="37vLTI" id="1ikTdkVP7w$" role="3clFbG">
306-
<node concept="37vLTw" id="1ikTdkVP5RU" role="37vLTJ">
303+
<node concept="3eNFk2" id="2rCuelUFCRs" role="3eNLev">
304+
<node concept="3clFbS" id="2rCuelUFCRt" role="3eOfB_">
305+
<node concept="3clFbF" id="2rCuelUFCRu" role="3cqZAp">
306+
<node concept="37vLTI" id="2rCuelUFCRv" role="3clFbG">
307+
<node concept="37vLTw" id="2rCuelUFCRw" role="37vLTJ">
307308
<ref role="3cqZAo" node="1ikTdkVOWLv" resolve="isValid" />
308309
</node>
309-
<node concept="2OqwBi" id="39ERoteuotn" role="37vLTx">
310-
<node concept="2OqwBi" id="39ERoteunxv" role="2Oq$k0">
311-
<node concept="1r4Lsj" id="1ikTdkVP7Cn" role="2Oq$k0" />
312-
<node concept="2yIwOk" id="39ERoteunRa" role="2OqNvi" />
310+
<node concept="2OqwBi" id="2rCuelUFCRx" role="37vLTx">
311+
<node concept="2OqwBi" id="2rCuelUFCRy" role="2Oq$k0">
312+
<node concept="1r4Lsj" id="2rCuelUFCRz" role="2Oq$k0" />
313+
<node concept="2yIwOk" id="2rCuelUFCR$" role="2OqNvi" />
313314
</node>
314-
<node concept="2qgKlT" id="39ERoteuoOS" role="2OqNvi">
315+
<node concept="2qgKlT" id="2rCuelUFCR_" role="2OqNvi">
315316
<ref role="37wK5l" to="gdgh:39ERoteujbz" resolve="isValidName" />
316-
<node concept="2OqwBi" id="1ikTdkVP81x" role="37wK5m">
317-
<node concept="Jnkvi" id="1ikTdkVP7E0" role="2Oq$k0">
317+
<node concept="2OqwBi" id="2rCuelUFCRA" role="37wK5m">
318+
<node concept="Jnkvi" id="2rCuelUFCRB" role="2Oq$k0">
318319
<ref role="1M0zk5" node="1ikTdkVOTCh" resolve="namedNode" />
319320
</node>
320-
<node concept="3TrcHB" id="1ikTdkVP8dU" role="2OqNvi">
321+
<node concept="3TrcHB" id="2rCuelUFCRC" role="2OqNvi">
321322
<ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
322323
</node>
323324
</node>
@@ -326,6 +327,17 @@
326327
</node>
327328
</node>
328329
</node>
330+
<node concept="2OqwBi" id="2rCuelUFFju" role="3eO9$A">
331+
<node concept="2OqwBi" id="2rCuelUFDoo" role="2Oq$k0">
332+
<node concept="Jnkvi" id="2rCuelUFDdA" role="2Oq$k0">
333+
<ref role="1M0zk5" node="1ikTdkVOTCh" resolve="namedNode" />
334+
</node>
335+
<node concept="3TrcHB" id="2rCuelUFD$J" role="2OqNvi">
336+
<ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
337+
</node>
338+
</node>
339+
<node concept="17RvpY" id="2rCuelUFGDQ" role="2OqNvi" />
340+
</node>
329341
</node>
330342
</node>
331343
<node concept="3clFbJ" id="1ikTdkVP8le" role="3cqZAp">

0 commit comments

Comments
 (0)