Skip to content

Commit 9e7d764

Browse files
alexanderpannalexanderpann
authored
Merge pull request #743 from IETS3/refactor/dont_call_interpreter_with_computation_trace_20213
2 parents afe4840 + 8c74834 commit 9e7d764

File tree

6 files changed

+1044
-398
lines changed

6 files changed

+1044
-398
lines changed

‎CHANGELOG.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,10 @@ The project does _not_ follow Semantic Versioning and the changes are documented
1717

1818
- The `all` and `any` operation of collections now also support the `index` expression. The concepts `AllWithIndexOp` and `AnyWithIndexOp` are therefore deprecated.
1919

20+
### Changed
21+
22+
- The class `IETS3ExprEvalHelper` was deprecated and a new class `IETS3ExprEvaluator` was introduced that can also influence the creation of the computation trace.
23+
2024
## November 2023
2125

2226
### Added

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

Lines changed: 874 additions & 339 deletions
Large diffs are not rendered by default.

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1721,8 +1721,8 @@
17211721
<node concept="3clFbF" id="7bd8pklcd$P" role="3cqZAp">
17221722
<node concept="37vLTI" id="7bd8pklcd$Q" role="3clFbG">
17231723
<node concept="2YIFZM" id="7bd8pklcd$R" role="37vLTx">
1724-
<ref role="37wK5l" to="pbu6:50LzNoSyDOv" resolve="getInterpreter" />
1725-
<ref role="1Pybhc" to="pbu6:3xDNhgd53E_" resolve="IETS3ExprEvalHelper" />
1724+
<ref role="1Pybhc" to="pbu6:2nydsCfyYD0" resolve="IETS3ExprEvaluator" />
1725+
<ref role="37wK5l" to="pbu6:2nydsCfzrJq" resolve="getInterpreter" />
17261726
</node>
17271727
<node concept="37vLTw" id="7bd8pklcd$S" role="37vLTJ">
17281728
<ref role="3cqZAo" node="7bd8pklbYCn" resolve="i" />

‎code/languages/org.iets3.opensource/languages/org.iets3.core.expr.repl/models/org/iets3/core/expr/repl/editor.mps‎

Lines changed: 29 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -238,6 +238,9 @@
238238
<concept id="1239714755177" name="jetbrains.mps.baseLanguage.structure.AbstractUnaryNumberOperation" flags="nn" index="2$Kvd9">
239239
<child id="1239714902950" name="expression" index="2$L3a6" />
240240
</concept>
241+
<concept id="2820489544401957797" name="jetbrains.mps.baseLanguage.structure.DefaultClassCreator" flags="nn" index="HV5vD">
242+
<reference id="2820489544401957798" name="classifier" index="HV5vE" />
243+
</concept>
241244
<concept id="1154032098014" name="jetbrains.mps.baseLanguage.structure.AbstractLoopStatement" flags="nn" index="2LF5Ji">
242245
<child id="1154032183016" name="body" index="2LFqv$" />
243246
</concept>
@@ -282,6 +285,9 @@
282285
<property id="1176718929932" name="isFinal" index="3TUv4t" />
283286
<child id="1068431790190" name="initializer" index="33vP2m" />
284287
</concept>
288+
<concept id="1513279640923991009" name="jetbrains.mps.baseLanguage.structure.IGenericClassCreator" flags="ng" index="366HgL">
289+
<property id="1513279640906337053" name="inferTypeParams" index="373rjd" />
290+
</concept>
285291
<concept id="1068498886296" name="jetbrains.mps.baseLanguage.structure.VariableReference" flags="nn" index="37vLTw">
286292
<reference id="1068581517664" name="variableDeclaration" index="3cqZAo" />
287293
</concept>
@@ -4059,18 +4065,31 @@
40594065
<node concept="1HfYo3" id="5avmkTFwB_q" role="1HlULh">
40604066
<node concept="3TQlhw" id="5avmkTFwB_r" role="1Hhtcw">
40614067
<node concept="3clFbS" id="5avmkTFwB_s" role="2VODD2">
4062-
<node concept="3clFbF" id="5avmkTFwB_t" role="3cqZAp">
4063-
<node concept="3cpWs3" id="5avmkTFwB_u" role="3clFbG">
4064-
<node concept="Xl_RD" id="5avmkTFwB_v" role="3uHU7w">
4068+
<node concept="3clFbF" id="5af9jCuPpkh" role="3cqZAp">
4069+
<node concept="3cpWs3" id="5af9jCuPECl" role="3clFbG">
4070+
<node concept="Xl_RD" id="5af9jCuPECp" role="3uHU7w">
40654071
<property role="Xl_RC" value="" />
40664072
</node>
4067-
<node concept="2YIFZM" id="5avmkTFwB_w" role="3uHU7B">
4068-
<ref role="1Pybhc" to="pbu6:3xDNhgd53E_" resolve="IETS3ExprEvalHelper" />
4069-
<ref role="37wK5l" to="pbu6:3xDNhgd54rl" resolve="evaluate" />
4070-
<node concept="2OqwBi" id="5avmkTFwB_x" role="37wK5m">
4071-
<node concept="pncrf" id="5avmkTFwB_y" role="2Oq$k0" />
4072-
<node concept="3TrEf2" id="5avmkTFwB_z" role="2OqNvi">
4073-
<ref role="3Tt5mk" to="wtll:5xEoEMrmiVo" resolve="expr" />
4073+
<node concept="2OqwBi" id="5af9jCuPDtl" role="3uHU7B">
4074+
<node concept="2OqwBi" id="5af9jCuPCOe" role="2Oq$k0">
4075+
<node concept="2ShNRf" id="5af9jCuPpkd" role="2Oq$k0">
4076+
<node concept="HV5vD" id="5af9jCuPB5n" role="2ShVmc">
4077+
<property role="373rjd" value="true" />
4078+
<ref role="HV5vE" to="pbu6:2nydsCfyYD0" resolve="IETS3ExprEvaluator" />
4079+
</node>
4080+
</node>
4081+
<node concept="liA8E" id="5af9jCuPDb6" role="2OqNvi">
4082+
<ref role="37wK5l" to="pbu6:2nydsCfvLxS" resolve="withComputationTrace" />
4083+
<node concept="3clFbT" id="5af9jCuPDeu" role="37wK5m" />
4084+
</node>
4085+
</node>
4086+
<node concept="liA8E" id="5af9jCuPDIc" role="2OqNvi">
4087+
<ref role="37wK5l" to="pbu6:2nydsCfz7eH" resolve="evaluate" />
4088+
<node concept="2OqwBi" id="5af9jCuPE18" role="37wK5m">
4089+
<node concept="pncrf" id="5af9jCuPDMB" role="2Oq$k0" />
4090+
<node concept="3TrEf2" id="5af9jCuPErD" role="2OqNvi">
4091+
<ref role="3Tt5mk" to="wtll:5xEoEMrmiVo" resolve="expr" />
4092+
</node>
40744093
</node>
40754094
</node>
40764095
</node>

‎code/languages/org.iets3.opensource/languages/org.iets3.core.expr.repl/models/org/iets3/core/expr/repl/typesystem.mps‎

Lines changed: 35 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,9 @@
6767
<concept id="1068431474542" name="jetbrains.mps.baseLanguage.structure.VariableDeclaration" flags="ng" index="33uBYm">
6868
<child id="1068431790190" name="initializer" index="33vP2m" />
6969
</concept>
70+
<concept id="1513279640923991009" name="jetbrains.mps.baseLanguage.structure.IGenericClassCreator" flags="ng" index="366HgL">
71+
<property id="1513279640906337053" name="inferTypeParams" index="373rjd" />
72+
</concept>
7073
<concept id="1068498886296" name="jetbrains.mps.baseLanguage.structure.VariableReference" flags="nn" index="37vLTw">
7174
<reference id="1068581517664" name="variableDeclaration" index="3cqZAo" />
7275
</concept>
@@ -1388,7 +1391,7 @@
13881391
<node concept="3clFbS" id="5avmkTFxQiD" role="3clFbx">
13891392
<node concept="3cpWs8" id="7HzLUeHnBt2" role="3cqZAp">
13901393
<node concept="3cpWsn" id="7HzLUeHnBt3" role="3cpWs9">
1391-
<property role="TrG5h" value="ctx" />
1394+
<property role="TrG5h" value="context" />
13921395
<node concept="3uibUv" id="7HzLUeHnBt0" role="1tU5fm">
13931396
<ref role="3uigEE" to="pbu6:6iqfHNC0mHl" resolve="IETS3ExprContext" />
13941397
</node>
@@ -1432,24 +1435,42 @@
14321435
<node concept="3uibUv" id="7HzLUeHnEEX" role="1tU5fm">
14331436
<ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
14341437
</node>
1435-
<node concept="2YIFZM" id="7HzLUeHnEF7" role="33vP2m">
1436-
<ref role="37wK5l" to="pbu6:Qsaevo33yK" resolve="evaluateWithContext" />
1437-
<ref role="1Pybhc" to="pbu6:3xDNhgd53E_" resolve="IETS3ExprEvalHelper" />
1438-
<node concept="2OqwBi" id="7HzLUeHnEF8" role="37wK5m">
1439-
<node concept="2OqwBi" id="7HzLUeHnEF9" role="2Oq$k0">
1440-
<node concept="1YBJjd" id="7HzLUeHnEFa" role="2Oq$k0">
1441-
<ref role="1YBMHb" node="3_Nra3EaXXG" resolve="cell" />
1438+
<node concept="2OqwBi" id="5af9jCuPLD$" role="33vP2m">
1439+
<node concept="2OqwBi" id="5af9jCuRFe3" role="2Oq$k0">
1440+
<node concept="2OqwBi" id="5af9jCuPKVE" role="2Oq$k0">
1441+
<node concept="2ShNRf" id="5af9jCuPKr6" role="2Oq$k0">
1442+
<node concept="HV5vD" id="5af9jCuPKSF" role="2ShVmc">
1443+
<property role="373rjd" value="true" />
1444+
<ref role="HV5vE" to="pbu6:2nydsCfyYD0" resolve="IETS3ExprEvaluator" />
1445+
</node>
14421446
</node>
1443-
<node concept="3TrEf2" id="7HzLUeHnEFb" role="2OqNvi">
1444-
<ref role="3Tt5mk" to="wtll:3_Nra3DTfmI" resolve="constraint" />
1447+
<node concept="liA8E" id="5af9jCuPL0W" role="2OqNvi">
1448+
<ref role="37wK5l" to="pbu6:2nydsCfvv5Z" resolve="withContext" />
1449+
<node concept="37vLTw" id="5af9jCuPL1K" role="37wK5m">
1450+
<ref role="3cqZAo" node="7HzLUeHnBt3" resolve="context" />
1451+
</node>
14451452
</node>
14461453
</node>
1447-
<node concept="3TrEf2" id="7HzLUeHnEFc" role="2OqNvi">
1448-
<ref role="3Tt5mk" to="wtll:3_Nra3DTaT2" resolve="constraint" />
1454+
<node concept="liA8E" id="5af9jCuRFMV" role="2OqNvi">
1455+
<ref role="37wK5l" to="pbu6:2nydsCfvLxS" resolve="withComputationTrace" />
1456+
<node concept="3clFbT" id="5af9jCuRG1D" role="37wK5m" />
14491457
</node>
14501458
</node>
1451-
<node concept="37vLTw" id="7HzLUeHnEFd" role="37wK5m">
1452-
<ref role="3cqZAo" node="7HzLUeHnBt3" resolve="ctx" />
1459+
<node concept="liA8E" id="5af9jCuPLI0" role="2OqNvi">
1460+
<ref role="37wK5l" to="pbu6:2nydsCfz7eH" resolve="evaluate" />
1461+
<node concept="2OqwBi" id="5af9jCuPLK2" role="37wK5m">
1462+
<node concept="2OqwBi" id="5af9jCuPLK3" role="2Oq$k0">
1463+
<node concept="1YBJjd" id="5af9jCuPLK4" role="2Oq$k0">
1464+
<ref role="1YBMHb" node="3_Nra3EaXXG" resolve="cell" />
1465+
</node>
1466+
<node concept="3TrEf2" id="5af9jCuPLK5" role="2OqNvi">
1467+
<ref role="3Tt5mk" to="wtll:3_Nra3DTfmI" resolve="constraint" />
1468+
</node>
1469+
</node>
1470+
<node concept="3TrEf2" id="5af9jCuPLK6" role="2OqNvi">
1471+
<ref role="3Tt5mk" to="wtll:3_Nra3DTaT2" resolve="constraint" />
1472+
</node>
1473+
</node>
14531474
</node>
14541475
</node>
14551476
</node>

0 commit comments

Comments
 (0)