Skip to content

Commit 15bcf1d

Browse files
WimBastWimBast
committed
Merge branch 'develop' into on-demand_interpreter
2 parents 05224c3 + 7c9064a commit 15bcf1d

File tree

2 files changed

+166
-47
lines changed

2 files changed

+166
-47
lines changed

‎languages/DclareMPS/models/behavior.mps

Lines changed: 33 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -442,9 +442,6 @@
442442
<child id="1180636770616" name="createdType" index="3zrR0E" />
443443
</concept>
444444
<concept id="1144146199828" name="jetbrains.mps.lang.smodel.structure.Node_CopyOperation" flags="nn" index="1$rogu" />
445-
<concept id="1219352745532" name="jetbrains.mps.lang.smodel.structure.NodeRefExpression" flags="nn" index="3B5_sB">
446-
<reference id="1219352800908" name="referentNode" index="3B5MYn" />
447-
</concept>
448445
<concept id="1144195091934" name="jetbrains.mps.lang.smodel.structure.Node_IsRoleOperation" flags="nn" index="1BlSNk">
449446
<reference id="1144195362400" name="conceptOfParent" index="1BmUXE" />
450447
<reference id="1144195396777" name="linkInParent" index="1Bn3mz" />
@@ -5933,7 +5930,10 @@
59335930
<node concept="YS8fn" id="4tUSE3JC9un" role="3cqZAp">
59345931
<node concept="2ShNRf" id="4tUSE3JC9uo" role="YScLw">
59355932
<node concept="1pGfFk" id="4tUSE3JC9up" role="2ShVmc">
5936-
<ref role="37wK5l" to="wyt6:~Error.&lt;init&gt;()" resolve="Error" />
5933+
<ref role="37wK5l" to="wyt6:~Error.&lt;init&gt;(java.lang.String)" resolve="Error" />
5934+
<node concept="Xl_RD" id="7q1zrYOBUTJ" role="37wK5m">
5935+
<property role="Xl_RC" value="isMany is unknown" />
5936+
</node>
59375937
</node>
59385938
</node>
59395939
</node>
@@ -14004,25 +14004,15 @@
1400414004
</node>
1400514005
</node>
1400614006
<node concept="3clFbH" id="5oUXqOrljDj" role="3cqZAp" />
14007-
<node concept="3cpWs8" id="5mlqCDjOLDd" role="3cqZAp">
14008-
<node concept="3cpWsn" id="5mlqCDjOLDe" role="3cpWs9">
14007+
<node concept="3cpWs8" id="7q1zrYO_9pF" role="3cqZAp">
14008+
<node concept="3cpWsn" id="7q1zrYO_9pG" role="3cpWs9">
1400914009
<property role="TrG5h" value="concept" />
14010-
<node concept="3Tqbb2" id="5mlqCDjOKNy" role="1tU5fm">
14011-
<ref role="ehGHo" to="tpce:f_TIwhg" resolve="ConceptDeclaration" />
14012-
</node>
14013-
<node concept="10QFUN" id="5mlqCDjOLDf" role="33vP2m">
14014-
<node concept="2OqwBi" id="5mlqCDjR2VU" role="10QFUP">
14015-
<node concept="2OqwBi" id="5mlqCDjOLDh" role="2Oq$k0">
14016-
<node concept="37vLTw" id="5mlqCDjOLDi" role="2Oq$k0">
14017-
<ref role="3cqZAo" node="76efOMRDF$i" resolve="quotationNode" />
14018-
</node>
14019-
<node concept="2yIwOk" id="5mlqCDjOLDj" role="2OqNvi" />
14020-
</node>
14021-
<node concept="FGMqu" id="5mlqCDjR5Ad" role="2OqNvi" />
14022-
</node>
14023-
<node concept="3Tqbb2" id="5mlqCDjOLDl" role="10QFUM">
14024-
<ref role="ehGHo" to="tpce:f_TIwhg" resolve="ConceptDeclaration" />
14010+
<node concept="3bZ5Sz" id="7q1zrYOxVD$" role="1tU5fm" />
14011+
<node concept="2OqwBi" id="7q1zrYO_9pH" role="33vP2m">
14012+
<node concept="37vLTw" id="7q1zrYO_9pI" role="2Oq$k0">
14013+
<ref role="3cqZAo" node="76efOMRDF$i" resolve="quotationNode" />
1402514014
</node>
14015+
<node concept="2yIwOk" id="7q1zrYO_9pJ" role="2OqNvi" />
1402614016
</node>
1402714017
</node>
1402814018
</node>
@@ -14040,14 +14030,14 @@
1404014030
</node>
1404114031
</node>
1404214032
</node>
14043-
<node concept="2OqwBi" id="5mlqCDjP3Uu" role="3K4Cdx">
14033+
<node concept="2OqwBi" id="7q1zrYO_Uz0" role="3K4Cdx">
1404414034
<node concept="37vLTw" id="5mlqCDjP0Q8" role="2Oq$k0">
14045-
<ref role="3cqZAo" node="5mlqCDjOLDe" resolve="concept" />
14035+
<ref role="3cqZAo" node="7q1zrYO_9pG" resolve="concept" />
1404614036
</node>
14047-
<node concept="2qgKlT" id="5mlqCDjP6B6" role="2OqNvi">
14048-
<ref role="37wK5l" to="tpcn:73yVtVlWOga" resolve="isSubconceptOf" />
14049-
<node concept="3B5_sB" id="5mlqCDjQMez" role="37wK5m">
14050-
<ref role="3B5MYn" to="tpck:h0TrEE$" resolve="INamedConcept" />
14037+
<node concept="liA8E" id="7q1zrYO_Zt2" role="2OqNvi">
14038+
<ref role="37wK5l" to="c17a:~SAbstractConcept.isSubConceptOf(org.jetbrains.mps.openapi.language.SAbstractConcept)" resolve="isSubConceptOf" />
14039+
<node concept="35c_gC" id="7q1zrYOAlnr" role="37wK5m">
14040+
<ref role="35c_gD" to="tpck:h0TrEE$" resolve="INamedConcept" />
1405114041
</node>
1405214042
</node>
1405314043
</node>
@@ -14106,8 +14096,16 @@
1410614096
<ref role="3Tt5mk" to="tp3r:4IP40Bi2KaL" resolve="concept" />
1410714097
</node>
1410814098
</node>
14109-
<node concept="37vLTw" id="5mlqCDjOLDm" role="37vLTx">
14110-
<ref role="3cqZAo" node="5mlqCDjOLDe" resolve="concept" />
14099+
<node concept="10QFUN" id="5mlqCDjOLDf" role="37vLTx">
14100+
<node concept="2OqwBi" id="5mlqCDjR2VU" role="10QFUP">
14101+
<node concept="37vLTw" id="7q1zrYO_9pK" role="2Oq$k0">
14102+
<ref role="3cqZAo" node="7q1zrYO_9pG" resolve="concept" />
14103+
</node>
14104+
<node concept="FGMqu" id="5mlqCDjR5Ad" role="2OqNvi" />
14105+
</node>
14106+
<node concept="3Tqbb2" id="5mlqCDjOLDl" role="10QFUM">
14107+
<ref role="ehGHo" to="tpce:f_TIwhg" resolve="ConceptDeclaration" />
14108+
</node>
1411114109
</node>
1411214110
</node>
1411314111
</node>
@@ -14173,11 +14171,8 @@
1417314171
</node>
1417414172
</node>
1417514173
<node concept="2OqwBi" id="3XBc7R1YkXH" role="33vP2m">
14176-
<node concept="2OqwBi" id="3XBc7R1YkXI" role="2Oq$k0">
14177-
<node concept="37vLTw" id="3XBc7R1YkXJ" role="2Oq$k0">
14178-
<ref role="3cqZAo" node="76efOMRDF$i" resolve="quotationNode" />
14179-
</node>
14180-
<node concept="2yIwOk" id="3XBc7R1YkXK" role="2OqNvi" />
14174+
<node concept="37vLTw" id="7q1zrYO_9pL" role="2Oq$k0">
14175+
<ref role="3cqZAo" node="7q1zrYO_9pG" resolve="concept" />
1418114176
</node>
1418214177
<node concept="liA8E" id="3XBc7R1YkXL" role="2OqNvi">
1418314178
<ref role="37wK5l" to="c17a:~SAbstractConcept.getProperties()" resolve="getProperties" />
@@ -14664,11 +14659,8 @@
1466414659
</node>
1466514660
</node>
1466614661
<node concept="2OqwBi" id="6hex_vHqwbj" role="33vP2m">
14667-
<node concept="2OqwBi" id="6hex_vHqwbk" role="2Oq$k0">
14668-
<node concept="37vLTw" id="6hex_vHqwbl" role="2Oq$k0">
14669-
<ref role="3cqZAo" node="76efOMRDF$i" resolve="quotationNode" />
14670-
</node>
14671-
<node concept="2yIwOk" id="6hex_vHqwbm" role="2OqNvi" />
14662+
<node concept="37vLTw" id="7q1zrYO_9pM" role="2Oq$k0">
14663+
<ref role="3cqZAo" node="7q1zrYO_9pG" resolve="concept" />
1467214664
</node>
1467314665
<node concept="liA8E" id="6hex_vHqwbn" role="2OqNvi">
1467414666
<ref role="37wK5l" to="c17a:~SAbstractConcept.getReferenceLinks()" resolve="getReferenceLinks" />
@@ -15172,11 +15164,8 @@
1517215164
</node>
1517315165
</node>
1517415166
<node concept="2OqwBi" id="6hex_vHr97x" role="33vP2m">
15175-
<node concept="2OqwBi" id="6hex_vHr97y" role="2Oq$k0">
15176-
<node concept="37vLTw" id="6hex_vHr97z" role="2Oq$k0">
15177-
<ref role="3cqZAo" node="76efOMRDF$i" resolve="quotationNode" />
15178-
</node>
15179-
<node concept="2yIwOk" id="6hex_vHr97$" role="2OqNvi" />
15167+
<node concept="37vLTw" id="7q1zrYO_9pN" role="2Oq$k0">
15168+
<ref role="3cqZAo" node="7q1zrYO_9pG" resolve="concept" />
1518015169
</node>
1518115170
<node concept="liA8E" id="6hex_vHr97_" role="2OqNvi">
1518215171
<ref role="37wK5l" to="c17a:~SAbstractConcept.getContainmentLinks()" resolve="getContainmentLinks" />

0 commit comments

Comments
 (0)