Skip to content

Commit 001b1ea

Browse files
committed
InterpreterRecordrenderer: fix links to model for (Short)LambdaExpression traces
Problem: Though the interpreter shows the traces for (Short)LambdaExpression-calculations for each parameter-value, these traces were not correctly linked, so it was not possible to go to the associated modelpart from the trace. The interpreter works on copies, which are not part of the model, of (Short)LambdaExpressions and linked the traces to these copies. Solution: Link the traces to the original Expression of the copies.
1 parent 956cacb commit 001b1ea

File tree

2 files changed

+293
-54
lines changed

2 files changed

+293
-54
lines changed

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

Lines changed: 28 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
<import index="5qo5" ref="r:6d93ddb1-b0b0-4eee-8079-51303666672a(org.iets3.core.expr.simpleTypes.structure)" />
3333
<import index="xfg9" ref="r:ac28053f-2041-47f6-806b-ecfaca05a64a(org.iets3.core.expr.base.runtime.runtime)" />
3434
<import index="w1kc" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.smodel(MPS.Core/)" />
35+
<import index="sxpq" ref="r:51edfe99-0380-475c-a3e9-1d4425eac12f(org.iets3.core.expr.lambda.plugin)" />
3536
</imports>
3637
<registry>
3738
<language id="af65afd8-f0dd-4942-87d9-63a55f2a9db1" name="jetbrains.mps.lang.behavior">
@@ -1198,6 +1199,19 @@
11981199
</node>
11991200
</node>
12001201
</node>
1202+
<node concept="3clFbF" id="6ITtBskX_T6" role="3cqZAp">
1203+
<node concept="37vLTI" id="6ITtBskXCFm" role="3clFbG">
1204+
<node concept="37vLTw" id="6ITtBskXD1g" role="37vLTx">
1205+
<ref role="3cqZAo" node="49WTic8ey5D" resolve="le" />
1206+
</node>
1207+
<node concept="3EllGN" id="6ITtBskXCft" role="37vLTJ">
1208+
<node concept="13iPFW" id="6ITtBskXCwr" role="3ElVtu" />
1209+
<node concept="37vLTw" id="6ITtBskX_T4" role="3ElQJh">
1210+
<ref role="3cqZAo" node="dsAFRk6ftq" resolve="mapping" />
1211+
</node>
1212+
</node>
1213+
</node>
1214+
</node>
12011215
<node concept="3clFbF" id="dsAFRk6g3s" role="3cqZAp">
12021216
<node concept="37vLTI" id="dsAFRk6hBt" role="3clFbG">
12031217
<node concept="1PxgMI" id="dsAFRk6jEb" role="37vLTx">
@@ -1506,23 +1520,20 @@
15061520
<node concept="3w_OXm" id="7cphKbKZT6H" role="2OqNvi" />
15071521
</node>
15081522
<node concept="3clFbC" id="7cphKbKZDbs" role="3uHU7B">
1509-
<node concept="2OqwBi" id="7cphKbKZyNA" role="3uHU7B">
1510-
<node concept="2OqwBi" id="7cphKbKZsxf" role="2Oq$k0">
1511-
<node concept="37vLTw" id="7cphKbKZslz" role="2Oq$k0">
1512-
<ref role="3cqZAo" node="49WTic8eCwS" resolve="it" />
1513-
</node>
1514-
<node concept="z$bX8" id="7cphKbKZt4m" role="2OqNvi">
1515-
<node concept="1xMEDy" id="7cphKbKZvOA" role="1xVPHs">
1516-
<node concept="chp4Y" id="7cphKbKZvRC" role="ri$Ld">
1517-
<ref role="cht4Q" to="zzzn:6zmBjqUkws6" resolve="LambdaExpression" />
1518-
</node>
1523+
<node concept="37vLTw" id="7cphKbKZDbJ" role="3uHU7w">
1524+
<ref role="3cqZAo" node="49WTic8ey5D" resolve="le" />
1525+
</node>
1526+
<node concept="2OqwBi" id="6ITtBskTCMh" role="3uHU7B">
1527+
<node concept="37vLTw" id="6ITtBskTCAp" role="2Oq$k0">
1528+
<ref role="3cqZAo" node="49WTic8eCwS" resolve="it" />
1529+
</node>
1530+
<node concept="2Xjw5R" id="6ITtBskTDpX" role="2OqNvi">
1531+
<node concept="1xMEDy" id="6ITtBskTDpZ" role="1xVPHs">
1532+
<node concept="chp4Y" id="6ITtBskTDMY" role="ri$Ld">
1533+
<ref role="cht4Q" to="zzzn:6zmBjqUkws6" resolve="LambdaExpression" />
15191534
</node>
15201535
</node>
15211536
</node>
1522-
<node concept="1uHKPH" id="7cphKbKZATZ" role="2OqNvi" />
1523-
</node>
1524-
<node concept="37vLTw" id="7cphKbKZDbJ" role="3uHU7w">
1525-
<ref role="3cqZAo" node="49WTic8ey5D" resolve="le" />
15261537
</node>
15271538
</node>
15281539
</node>
@@ -1545,8 +1556,9 @@
15451556
</node>
15461557
<node concept="liA8E" id="dsAFRk4vCP" role="2OqNvi">
15471558
<ref role="37wK5l" to="mhbf:~SNode.putUserObject(java.lang.Object,java.lang.Object)" resolve="putUserObject" />
1548-
<node concept="Xl_RD" id="dsAFRk4vDs" role="37wK5m">
1549-
<property role="Xl_RC" value="shortLambdaMapping" />
1559+
<node concept="10M0yZ" id="6ITtBskT5VX" role="37wK5m">
1560+
<ref role="3cqZAo" to="sxpq:6ITtBskT0za" resolve="USER_OBJECT_KEY" />
1561+
<ref role="1PxDUh" to="sxpq:$yb$20f$a5" resolve="LambdaValue" />
15501562
</node>
15511563
<node concept="37vLTw" id="dsAFRk6mvt" role="37wK5m">
15521564
<ref role="3cqZAo" node="dsAFRk6ftq" resolve="mapping" />

0 commit comments

Comments
 (0)