Merge pull request #999 from IETS3/merge/mps20222

Merge maintenance/mps20222 into maintenance/mps20223
IETS3 · Jul 2, 2024 · 703ce46 · 703ce46
2 parents aa2ad1d + 25a895a
commit 703ce46
Show file tree

Hide file tree

Showing 2 changed files with 70 additions and 1 deletion.
diff --git a/.../org.iets3.opensource/solutions/org.iets3.core.expr.mutable.interpreter/models/plugin.mps b/.../org.iets3.opensource/solutions/org.iets3.core.expr.mutable.interpreter/models/plugin.mps
@@ -79,6 +79,7 @@
         <reference id="1068581517664" name="variableDeclaration" index="3cqZAo" />
       </concept>
       <concept id="1068498886294" name="jetbrains.mps.baseLanguage.structure.AssignmentExpression" flags="nn" index="37vLTI" />
+      <concept id="1225271221393" name="jetbrains.mps.baseLanguage.structure.NPENotEqualsExpression" flags="nn" index="17QLQc" />
       <concept id="4972933694980447171" name="jetbrains.mps.baseLanguage.structure.BaseVariableDeclaration" flags="ng" index="19Szcq">
         <child id="5680397130376446158" name="type" index="1tU5fm" />
       </concept>
@@ -1499,7 +1500,7 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="3y3z36" id="31BLocd1vbM" role="3clFbw">
+                      <node concept="17QLQc" id="6heyteL2CCO" role="3clFbw">
                         <node concept="2OqwBi" id="31BLocd1ujv" role="3uHU7B">
                           <node concept="37vLTw" id="31BLocd1u31" role="2Oq$k0">
                             <ref role="3cqZAo" node="79jc6YzfDTX" resolve="box" />

diff --git a/code/languages/org.iets3.opensource/tests/test.in.expr.os/models/[email protected] b/code/languages/org.iets3.opensource/tests/test.in.expr.os/models/[email protected]
@@ -15363,6 +15363,60 @@
       </node>
       <node concept="2lgajY" id="31BLocd6Wj6" role="28QfE6" />
     </node>
+    <node concept="_ixoA" id="6heyteL1vwq" role="_iOnB" />
+    <node concept="1aga60" id="6heyteL1qjw" role="_iOnB">
+      <property role="TrG5h" value="updateWithInequalityCheck" />
+      <property role="0Rz4W" value="1847778412" />
+      <node concept="1aduha" id="6heyteL1qjx" role="1ahQXP">
+        <node concept="1adJid" id="6heyteL1qjy" role="1aduh9">
+          <property role="TrG5h" value="x" />
+          <property role="0Rz4W" value="-319067166" />
+          <node concept="1QScDb" id="6heyteL1qjz" role="1adJii">
+            <node concept="3sQ2Ir" id="6heyteL1qj$" role="1QScD9" />
+            <node concept="1afdae" id="6heyteL1qj_" role="30czhm">
+              <ref role="1afue_" node="6heyteL1qjM" resolve="b" />
+            </node>
+          </node>
+        </node>
+        <node concept="1QScDb" id="6heyteL1qjA" role="1aduh9">
+          <node concept="3sPC8h" id="6heyteL1qjB" role="1QScD9">
+            <node concept="30bXRB" id="6heyteL1qjC" role="3sPC8l">
+              <property role="30bXRw" value="12" />
+            </node>
+          </node>
+          <node concept="1afdae" id="6heyteL1qjD" role="30czhm">
+            <ref role="1afue_" node="6heyteL1qjM" resolve="b" />
+          </node>
+        </node>
+        <node concept="1QScDb" id="6heyteL1qjE" role="1aduh9">
+          <node concept="3sPC8h" id="6heyteL1qjF" role="1QScD9">
+            <node concept="30dDZf" id="6heyteL1qjG" role="3sPC8l">
+              <node concept="30bXRB" id="6heyteL1qjH" role="30dEs_">
+                <property role="30bXRw" value="1" />
+              </node>
+              <node concept="1adzI2" id="6heyteL1qjI" role="30dEsF">
+                <ref role="1adwt6" node="6heyteL1qjy" resolve="x" />
+              </node>
+            </node>
+            <node concept="Xo_xD" id="6heyteL1qjJ" role="Xo_xA">
+              <node concept="30bXRB" id="6heyteL1r5C" role="Xo_xC">
+                <property role="30bXRw" value="12" />
+              </node>
+            </node>
+          </node>
+          <node concept="1afdae" id="6heyteL1qjL" role="30czhm">
+            <ref role="1afue_" node="6heyteL1qjM" resolve="b" />
+          </node>
+        </node>
+      </node>
+      <node concept="1ahQXy" id="6heyteL1qjM" role="1ahQWs">
+        <property role="TrG5h" value="b" />
+        <node concept="3sNe5_" id="6heyteL1qjN" role="3ix9CU">
+          <node concept="mLuIC" id="6heyteL1qjO" role="3sNe5$" />
+        </node>
+      </node>
+      <node concept="2lgajY" id="6heyteL1qjP" role="28QfE6" />
+    </node>
     <node concept="_ixoA" id="31BLocd6Uy3" role="_iOnB" />
     <node concept="_fkuM" id="31BLocd6UAj" role="_iOnB">
       <property role="TrG5h" value="TestUpdateCheck" />
@@ -15396,6 +15450,20 @@
           <property role="30bXRw" value="11" />
         </node>
       </node>
+      <node concept="_fkuZ" id="6heyteL2jZ9" role="_fkp5">
+        <node concept="_fku$" id="6heyteL2jZa" role="_fkur" />
+        <node concept="1af_rf" id="6heyteL2kca" role="_fkuY">
+          <ref role="1afhQb" node="6heyteL1qjw" resolve="updateWithEqualityCheck" />
+          <node concept="3sRH3H" id="6heyteL2kcy" role="1afhQ5">
+            <node concept="30bXRB" id="6heyteL2kgS" role="3sRH3h">
+              <property role="30bXRw" value="10" />
+            </node>
+          </node>
+        </node>
+        <node concept="30bXRB" id="6heyteL2klU" role="_fkuS">
+          <property role="30bXRw" value="11" />
+        </node>
+      </node>
       <node concept="mXNUv" id="31BLocd6XTq" role="_fkp5">
         <node concept="1af_rf" id="31BLocd6XgT" role="mXJVd">
           <property role="0Rz4W" value="690784977" />