Skip to content

Commit efe6dc9

Browse files
committed
Rework isSameAs functions to use concept.isExactly.
The prior Object.equals function was not very descriptive while having the same effect.
1 parent fc7692c commit efe6dc9

File tree

1 file changed

+34
-27
lines changed
  • code/languages/org.iets3.opensource/languages/org.iets3.core.expr.collections/models

1 file changed

+34
-27
lines changed

code/languages/org.iets3.opensource/languages/org.iets3.core.expr.collections/models/behavior.mps

Lines changed: 34 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -197,6 +197,9 @@
197197
<concept id="1176544042499" name="jetbrains.mps.lang.typesystem.structure.Node_TypeOperation" flags="nn" index="3JvlWi" />
198198
</language>
199199
<language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
200+
<concept id="1204834851141" name="jetbrains.mps.lang.smodel.structure.PoundExpression" flags="ng" index="25Kdxt">
201+
<child id="1204834868751" name="expression" index="25KhWn" />
202+
</concept>
200203
<concept id="1177026924588" name="jetbrains.mps.lang.smodel.structure.RefConcept_Reference" flags="nn" index="chp4Y">
201204
<reference id="1177026940964" name="conceptDeclaration" index="cht4Q" />
202205
</concept>
@@ -1419,20 +1422,6 @@
14191422
</node>
14201423
<node concept="3clFbF" id="5L2mTKm_vU3" role="3cqZAp">
14211424
<node concept="1Wc70l" id="5L2mTKm_y6d" role="3clFbG">
1422-
<node concept="2YIFZM" id="5E_O2NLXyie" role="3uHU7w">
1423-
<ref role="37wK5l" to="33ny:~Objects.equals(java.lang.Object,java.lang.Object)" resolve="equals" />
1424-
<ref role="1Pybhc" to="33ny:~Objects" resolve="Objects" />
1425-
<node concept="2OqwBi" id="5E_O2NLXy_i" role="37wK5m">
1426-
<node concept="13iPFW" id="5E_O2NLXyp8" role="2Oq$k0" />
1427-
<node concept="2yIwOk" id="5E_O2NLXz8x" role="2OqNvi" />
1428-
</node>
1429-
<node concept="2OqwBi" id="5L2mTKm_KSC" role="37wK5m">
1430-
<node concept="37vLTw" id="5L2mTKm_KDr" role="2Oq$k0">
1431-
<ref role="3cqZAo" node="5L2mTKm_vHh" resolve="casted" />
1432-
</node>
1433-
<node concept="2yIwOk" id="5L2mTKm_Loi" role="2OqNvi" />
1434-
</node>
1435-
</node>
14361425
<node concept="2OqwBi" id="5L2mTKm_wGj" role="3uHU7B">
14371426
<node concept="2OqwBi" id="5L2mTKm_w6k" role="2Oq$k0">
14381427
<node concept="13iPFW" id="5L2mTKm_x7x" role="2Oq$k0" />
@@ -1452,6 +1441,22 @@
14521441
</node>
14531442
</node>
14541443
</node>
1444+
<node concept="2OqwBi" id="4PaWMNg$fqb" role="3uHU7w">
1445+
<node concept="2OqwBi" id="4PaWMNg$eA7" role="2Oq$k0">
1446+
<node concept="13iPFW" id="4PaWMNg$ecv" role="2Oq$k0" />
1447+
<node concept="2yIwOk" id="4PaWMNg$f4q" role="2OqNvi" />
1448+
</node>
1449+
<node concept="3O6GUB" id="4PaWMNg$g0h" role="2OqNvi">
1450+
<node concept="25Kdxt" id="4PaWMNg$gib" role="3QVz_e">
1451+
<node concept="2OqwBi" id="4PaWMNg$h2P" role="25KhWn">
1452+
<node concept="37vLTw" id="4PaWMNg$g$6" role="2Oq$k0">
1453+
<ref role="3cqZAo" node="5L2mTKm_vHh" resolve="casted" />
1454+
</node>
1455+
<node concept="2yIwOk" id="4PaWMNg$hxU" role="2OqNvi" />
1456+
</node>
1457+
</node>
1458+
</node>
1459+
</node>
14551460
</node>
14561461
</node>
14571462
</node>
@@ -4695,19 +4700,21 @@
46954700
</node>
46964701
</node>
46974702
<node concept="3clFbF" id="6iWyECL0XoQ" role="3cqZAp">
4698-
<node concept="1Wc70l" id="6iWyECL15ZG" role="3clFbG">
4699-
<node concept="2YIFZM" id="6iWyECL16vw" role="3uHU7w">
4700-
<ref role="37wK5l" to="33ny:~Objects.equals(java.lang.Object,java.lang.Object)" resolve="equals" />
4701-
<ref role="1Pybhc" to="33ny:~Objects" resolve="Objects" />
4702-
<node concept="2OqwBi" id="6iWyECL174_" role="37wK5m">
4703-
<node concept="13iPFW" id="6iWyECL16Iq" role="2Oq$k0" />
4704-
<node concept="2yIwOk" id="6iWyECL17yH" role="2OqNvi" />
4705-
</node>
4706-
<node concept="2OqwBi" id="6iWyECL18m5" role="37wK5m">
4707-
<node concept="37vLTw" id="6iWyECL180d" role="2Oq$k0">
4708-
<ref role="3cqZAo" node="6iWyECL0FjB" resolve="other" />
4709-
</node>
4710-
<node concept="2yIwOk" id="6iWyECL18MM" role="2OqNvi" />
4703+
<node concept="1Wc70l" id="4PaWMNg$8Rk" role="3clFbG">
4704+
<node concept="2OqwBi" id="4PaWMNg$a27" role="3uHU7w">
4705+
<node concept="2OqwBi" id="4PaWMNg$9jX" role="2Oq$k0">
4706+
<node concept="13iPFW" id="4PaWMNg$93m" role="2Oq$k0" />
4707+
<node concept="2yIwOk" id="4PaWMNg$9GV" role="2OqNvi" />
4708+
</node>
4709+
<node concept="3O6GUB" id="4PaWMNg$aAp" role="2OqNvi">
4710+
<node concept="25Kdxt" id="4PaWMNg$aRz" role="3QVz_e">
4711+
<node concept="2OqwBi" id="4PaWMNg$blE" role="25KhWn">
4712+
<node concept="37vLTw" id="4PaWMNg$b8I" role="2Oq$k0">
4713+
<ref role="3cqZAo" node="6iWyECL0FjB" resolve="other" />
4714+
</node>
4715+
<node concept="2yIwOk" id="4PaWMNg$bMG" role="2OqNvi" />
4716+
</node>
4717+
</node>
47114718
</node>
47124719
</node>
47134720
<node concept="1Wc70l" id="6iWyECL11pN" role="3uHU7B">

0 commit comments

Comments
 (0)