Skip to content

Commit 1f225e2

Browse files
kbirkenkbirken
authored
Merge pull request #503 from IETS3/bugfix/NixHandlingForLogicalOps
Fix two inconsistencies with Nix-handling in interpreter
2 parents fe933fc + b4a0001 commit 1f225e2

File tree

3 files changed

+173
-22
lines changed

3 files changed

+173
-22
lines changed

‎code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.simpleTypes.interpreter/models/plugin.mps‎

Lines changed: 53 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -2442,19 +2442,52 @@
24422442
</node>
24432443
</node>
24442444
</node>
2445-
<node concept="3clFbJ" id="4EEJFuvbYy0" role="3cqZAp">
2446-
<node concept="3clFbS" id="4EEJFuvbYy1" role="3clFbx">
2447-
<node concept="3cpWs6" id="4EEJFuvbYy2" role="3cqZAp">
2448-
<node concept="37vLTw" id="4EEJFuvbYy3" role="3cqZAk">
2449-
<ref role="3cqZAo" node="4EEJFuvbYxy" resolve="leftNixEvaluated" />
2445+
<node concept="3cpWs8" id="skNXYt0e7f" role="3cqZAp">
2446+
<node concept="3cpWsn" id="skNXYt0e7g" role="3cpWs9">
2447+
<property role="TrG5h" value="right" />
2448+
<node concept="3uibUv" id="skNXYt0e7h" role="1tU5fm">
2449+
<ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
2450+
</node>
2451+
<node concept="qpA2v" id="skNXYt0e7i" role="33vP2m">
2452+
<node concept="2OqwBi" id="skNXYt0e7j" role="3SLO0q">
2453+
<node concept="oxGPV" id="skNXYt0e7k" role="2Oq$k0" />
2454+
<node concept="3TrEf2" id="skNXYt0e7l" role="2OqNvi">
2455+
<ref role="3Tt5mk" to="hm2y:4rZeNQ6MpKo" resolve="right" />
2456+
</node>
2457+
</node>
2458+
</node>
2459+
</node>
2460+
</node>
2461+
<node concept="3clFbJ" id="skNXYt0e7m" role="3cqZAp">
2462+
<node concept="3clFbS" id="skNXYt0e7n" role="3clFbx">
2463+
<node concept="3cpWs6" id="skNXYt0e7o" role="3cqZAp">
2464+
<node concept="2OqwBi" id="skNXYt0e7p" role="3cqZAk">
2465+
<node concept="2ShNRf" id="skNXYt0e7q" role="2Oq$k0">
2466+
<node concept="1pGfFk" id="skNXYt0e7r" role="2ShVmc">
2467+
<ref role="37wK5l" to="xfg9:3nVyItrYQU_" resolve="NixSupport" />
2468+
<node concept="3clFbT" id="skNXYt0e7s" role="37wK5m">
2469+
<property role="3clFbU" value="true" />
2470+
</node>
2471+
<node concept="37vLTw" id="skNXYt0e7t" role="37wK5m">
2472+
<ref role="3cqZAo" node="skNXYt0e7g" resolve="right" />
2473+
</node>
2474+
<node concept="oxGPV" id="skNXYt0e7u" role="37wK5m" />
2475+
<node concept="37vLTw" id="skNXYt0f5w" role="37wK5m">
2476+
<ref role="3cqZAo" node="2pRaEpcR5l_" resolve="andCalculator" />
2477+
</node>
2478+
</node>
2479+
</node>
2480+
<node concept="liA8E" id="skNXYt0e7w" role="2OqNvi">
2481+
<ref role="37wK5l" to="xfg9:26cjRABQZG3" resolve="run" />
2482+
</node>
24502483
</node>
24512484
</node>
24522485
</node>
2453-
<node concept="2ZW3vV" id="4EEJFuvbYy4" role="3clFbw">
2454-
<node concept="3uibUv" id="4EEJFuvbYy5" role="2ZW6by">
2486+
<node concept="2ZW3vV" id="skNXYt0e7x" role="3clFbw">
2487+
<node concept="3uibUv" id="skNXYt0e7y" role="2ZW6by">
24552488
<ref role="3uigEE" to="ppzb:3nVyItrYNyp" resolve="INixValue" />
24562489
</node>
2457-
<node concept="37vLTw" id="4EEJFuvbYy6" role="2ZW6bz">
2490+
<node concept="37vLTw" id="skNXYt0e7z" role="2ZW6bz">
24582491
<ref role="3cqZAo" node="4EEJFuvbYxy" resolve="leftNixEvaluated" />
24592492
</node>
24602493
</node>
@@ -2468,13 +2501,8 @@
24682501
<node concept="37vLTw" id="4EEJFuvbZRP" role="37wK5m">
24692502
<ref role="3cqZAo" node="4EEJFuvbYxr" resolve="left" />
24702503
</node>
2471-
<node concept="qpA2v" id="26cjRACQHvv" role="37wK5m">
2472-
<node concept="2OqwBi" id="26cjRACQHvw" role="3SLO0q">
2473-
<node concept="oxGPV" id="26cjRACQHvx" role="2Oq$k0" />
2474-
<node concept="3TrEf2" id="26cjRACQHvy" role="2OqNvi">
2475-
<ref role="3Tt5mk" to="hm2y:4rZeNQ6MpKo" resolve="right" />
2476-
</node>
2477-
</node>
2504+
<node concept="37vLTw" id="skNXYt0fho" role="37wK5m">
2505+
<ref role="3cqZAo" node="skNXYt0e7g" resolve="right" />
24782506
</node>
24792507
<node concept="oxGPV" id="26cjRACQHvz" role="37wK5m" />
24802508
<node concept="37vLTw" id="2pRaEpcR714" role="37wK5m">
@@ -3184,8 +3212,16 @@
31843212
<node concept="3uibUv" id="26cjRACIbgA" role="1tU5fm">
31853213
<ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
31863214
</node>
3187-
<node concept="rqRoa" id="26cjRACIbgB" role="33vP2m">
3188-
<ref role="rqRob" to="hm2y:4rZeNQ6MpKo" resolve="right" />
3215+
<node concept="2OqwBi" id="skNXYt0dcP" role="33vP2m">
3216+
<node concept="37vLTw" id="skNXYt0cXQ" role="2Oq$k0">
3217+
<ref role="3cqZAo" node="26cjRACI9si" resolve="s" />
3218+
</node>
3219+
<node concept="liA8E" id="skNXYt0dSJ" role="2OqNvi">
3220+
<ref role="37wK5l" to="xfg9:3nVyIts6HwG" resolve="get" />
3221+
<node concept="3cmrfG" id="skNXYt0e0D" role="37wK5m">
3222+
<property role="3cmrfH" value="1" />
3223+
</node>
3224+
</node>
31893225
</node>
31903226
</node>
31913227
</node>

‎code/languages/org.iets3.opensource/tests/test.in.expr.os/models/[email protected]‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@
182182
<ref role="_emDf" node="1Z72MIc6zOc" resolve="nix" />
183183
</node>
184184
</node>
185-
<node concept="1I1voI" id="4EEJFuvb1T8" role="_fkuS" />
185+
<node concept="2vmpn$" id="skNXYt2YZ2" role="_fkuS" />
186186
</node>
187187
<node concept="_fkuZ" id="1Z72MIc6xWE" role="_fkp5">
188188
<node concept="_fku$" id="1Z72MIc6xWF" role="_fkur" />

‎code/languages/org.iets3.opensource/tests/test.in.expr.os/models/[email protected]‎

Lines changed: 119 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@
3131
<child id="5115872837156802411" name="expr" index="30czhm" />
3232
</concept>
3333
<concept id="5115872837156855227" name="org.iets3.core.expr.base.structure.UnaryMinusExpression" flags="ng" index="30cIq6" />
34+
<concept id="5115872837156761033" name="org.iets3.core.expr.base.structure.EqualsExpression" flags="ng" index="30cPrO" />
35+
<concept id="5115872837156761034" name="org.iets3.core.expr.base.structure.NotEqualsExpression" flags="ng" index="30cPrR" />
3436
<concept id="5115872837156578546" name="org.iets3.core.expr.base.structure.PlusExpression" flags="ng" index="30dDZf" />
3537
<concept id="5115872837156576277" name="org.iets3.core.expr.base.structure.BinaryExpression" flags="ng" index="30dEsC">
3638
<child id="5115872837156576280" name="right" index="30dEs_" />
@@ -98,7 +100,7 @@
98100
<property role="1XBH2A" value="true" />
99101
<node concept="2zPypq" id="3nVyIts6jOS" role="_iOnB">
100102
<property role="TrG5h" value="a1" />
101-
<property role="0Rz4W" value="1551182782" />
103+
<property role="0Rz4W" value="611402695" />
102104
<node concept="1I1voI" id="3nVyIts6jPi" role="2zPyp_" />
103105
<node concept="30bXR$" id="3nVyIts6jP4" role="2zM23F" />
104106
</node>
@@ -183,8 +185,8 @@
183185
</node>
184186
<node concept="_ixoA" id="26cjRABTkuN" role="_iOnB" />
185187
<node concept="2zPypq" id="26cjRABTkwo" role="_iOnB">
186-
<property role="TrG5h" value="cond" />
187-
<property role="0Rz4W" value="1563357530" />
188+
<property role="TrG5h" value="nix" />
189+
<property role="0Rz4W" value="614927467" />
188190
<node concept="1I1voI" id="26cjRABTkxt" role="2zPyp_">
189191
<node concept="2vmvy5" id="26cjRABTkxF" role="1I1voH" />
190192
</node>
@@ -201,7 +203,7 @@
201203
</node>
202204
</node>
203205
<node concept="_emDc" id="26cjRABTkAR" role="39w5ZE">
204-
<ref role="_emDf" node="26cjRABTkwo" resolve="cond" />
206+
<ref role="_emDf" node="26cjRABTkwo" resolve="nix" />
205207
</node>
206208
<node concept="30bXRB" id="26cjRABTkB6" role="39w5ZG">
207209
<property role="30bXRw" value="10" />
@@ -212,6 +214,119 @@
212214
</node>
213215
</node>
214216
</node>
217+
<node concept="_ixoA" id="skNXYt4tKK" role="_iOnB" />
218+
<node concept="_fkuM" id="skNXYt4tMD" role="_iOnB">
219+
<property role="TrG5h" value="EqualityBoolean" />
220+
<node concept="_fkuZ" id="4EEJFuvb1T3" role="_fkp5">
221+
<node concept="_fku$" id="4EEJFuvb1T4" role="_fkur" />
222+
<node concept="30cPrO" id="skNXYt4tPI" role="_fkuY">
223+
<node concept="2vmpn$" id="4EEJFuvb1UW" role="30dEs_" />
224+
<node concept="_emDc" id="skNXYt4uEg" role="30dEsF">
225+
<ref role="_emDf" node="26cjRABTkwo" resolve="nix" />
226+
</node>
227+
</node>
228+
<node concept="1I1voI" id="skNXYt4u6s" role="_fkuS" />
229+
</node>
230+
<node concept="_fkuZ" id="1Z72MIc6xWE" role="_fkp5">
231+
<node concept="_fku$" id="1Z72MIc6xWF" role="_fkur" />
232+
<node concept="1I1voI" id="skNXYt4u6H" role="_fkuS" />
233+
<node concept="30cPrO" id="skNXYt4tQ$" role="_fkuY">
234+
<node concept="2vmpn$" id="1Z72MIctSOG" role="30dEsF" />
235+
<node concept="_emDc" id="skNXYt4uEw" role="30dEs_">
236+
<ref role="_emDf" node="26cjRABTkwo" resolve="nix" />
237+
</node>
238+
</node>
239+
</node>
240+
<node concept="_fkuZ" id="skNXYt4u3g" role="_fkp5">
241+
<node concept="_fku$" id="skNXYt4u3h" role="_fkur" />
242+
<node concept="30cPrO" id="skNXYt4u3i" role="_fkuY">
243+
<node concept="2vmpnb" id="skNXYt4u4g" role="30dEs_" />
244+
<node concept="_emDc" id="skNXYt4uEs" role="30dEsF">
245+
<ref role="_emDf" node="26cjRABTkwo" resolve="nix" />
246+
</node>
247+
</node>
248+
<node concept="1I1voI" id="skNXYt4u3l" role="_fkuS" />
249+
</node>
250+
<node concept="_fkuZ" id="4EEJFuvaWda" role="_fkp5">
251+
<node concept="_fku$" id="skNXYt4tTh" role="_fkur" />
252+
<node concept="30cPrO" id="skNXYt4tSp" role="_fkuY">
253+
<node concept="2vmpnb" id="4EEJFuvb91X" role="30dEsF" />
254+
<node concept="_emDc" id="skNXYt4uE$" role="30dEs_">
255+
<ref role="_emDf" node="26cjRABTkwo" resolve="nix" />
256+
</node>
257+
</node>
258+
<node concept="1I1voI" id="4EEJFuvb1SV" role="_fkuS" />
259+
</node>
260+
<node concept="_fkuZ" id="skNXYt4u55" role="_fkp5">
261+
<node concept="_fku$" id="skNXYt4u56" role="_fkur" />
262+
<node concept="30cPrO" id="skNXYt4u57" role="_fkuY">
263+
<node concept="_emDc" id="skNXYt4uEk" role="30dEsF">
264+
<ref role="_emDf" node="26cjRABTkwo" resolve="nix" />
265+
</node>
266+
<node concept="_emDc" id="skNXYt4uEo" role="30dEs_">
267+
<ref role="_emDf" node="26cjRABTkwo" resolve="nix" />
268+
</node>
269+
</node>
270+
<node concept="1I1voI" id="skNXYt4u5a" role="_fkuS" />
271+
</node>
272+
</node>
273+
<node concept="_ixoA" id="skNXYt4uiJ" role="_iOnB" />
274+
<node concept="_fkuM" id="skNXYt4ulK" role="_iOnB">
275+
<property role="TrG5h" value="InequalityBoolean" />
276+
<node concept="_fkuZ" id="skNXYt4ulL" role="_fkp5">
277+
<node concept="_fku$" id="skNXYt4ulM" role="_fkur" />
278+
<node concept="30cPrR" id="skNXYt4upo" role="_fkuY">
279+
<node concept="_emDc" id="skNXYt4uE8" role="30dEsF">
280+
<ref role="_emDf" node="26cjRABTkwo" resolve="nix" />
281+
</node>
282+
<node concept="2vmpn$" id="skNXYt4ulO" role="30dEs_" />
283+
</node>
284+
<node concept="1I1voI" id="skNXYt4ulQ" role="_fkuS" />
285+
</node>
286+
<node concept="_fkuZ" id="skNXYt4ulR" role="_fkp5">
287+
<node concept="_fku$" id="skNXYt4ulS" role="_fkur" />
288+
<node concept="1I1voI" id="skNXYt4ulT" role="_fkuS" />
289+
<node concept="30cPrR" id="skNXYt4urv" role="_fkuY">
290+
<node concept="2vmpn$" id="skNXYt4ulV" role="30dEsF" />
291+
<node concept="_emDc" id="skNXYt4uEC" role="30dEs_">
292+
<ref role="_emDf" node="26cjRABTkwo" resolve="nix" />
293+
</node>
294+
</node>
295+
</node>
296+
<node concept="_fkuZ" id="skNXYt4ulX" role="_fkp5">
297+
<node concept="_fku$" id="skNXYt4ulY" role="_fkur" />
298+
<node concept="30cPrR" id="skNXYt4utA" role="_fkuY">
299+
<node concept="_emDc" id="skNXYt4uE0" role="30dEsF">
300+
<ref role="_emDf" node="26cjRABTkwo" resolve="nix" />
301+
</node>
302+
<node concept="2vmpnb" id="skNXYt4um0" role="30dEs_" />
303+
</node>
304+
<node concept="1I1voI" id="skNXYt4um2" role="_fkuS" />
305+
</node>
306+
<node concept="_fkuZ" id="skNXYt4um3" role="_fkp5">
307+
<node concept="_fku$" id="skNXYt4um4" role="_fkur" />
308+
<node concept="30cPrR" id="skNXYt4uvH" role="_fkuY">
309+
<node concept="2vmpnb" id="skNXYt4um6" role="30dEsF" />
310+
<node concept="_emDc" id="skNXYt4uEG" role="30dEs_">
311+
<ref role="_emDf" node="26cjRABTkwo" resolve="nix" />
312+
</node>
313+
</node>
314+
<node concept="1I1voI" id="skNXYt4um8" role="_fkuS" />
315+
</node>
316+
<node concept="_fkuZ" id="skNXYt4um9" role="_fkp5">
317+
<node concept="_fku$" id="skNXYt4uma" role="_fkur" />
318+
<node concept="30cPrR" id="skNXYt4uxO" role="_fkuY">
319+
<node concept="_emDc" id="skNXYt4uEc" role="30dEsF">
320+
<ref role="_emDf" node="26cjRABTkwo" resolve="nix" />
321+
</node>
322+
<node concept="_emDc" id="skNXYt4uE4" role="30dEs_">
323+
<ref role="_emDf" node="26cjRABTkwo" resolve="nix" />
324+
</node>
325+
</node>
326+
<node concept="1I1voI" id="skNXYt4ume" role="_fkuS" />
327+
</node>
328+
</node>
329+
<node concept="_ixoA" id="skNXYt4ukf" role="_iOnB" />
215330
</node>
216331
</model>
217332

0 commit comments

Comments
 (0)