Merge pull request #2586 from mbeddr/merge/mps20241

Merge maintenance/mps20241 into master
mbeddr · Nov 15, 2024 · 57c257c · 57c257c
2 parents 244145e + 377d670
commit 57c257c
Showing 1 changed file with 33 additions and 0 deletions.
diff --git a/...ges/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare/languageModels/typesystem.mps b/...ges/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare/languageModels/typesystem.mps
@@ -112,6 +112,9 @@
             </node>
           </node>
         </node>
+        <node concept="1YBJjd" id="77BxNvs6uQY" role="1ZmcU8">
+          <ref role="1YBMHb" node="2lpUxXMeGs5" resolve="assertNodeEquals" />
+        </node>
       </node>
       <node concept="1Z5TYs" id="3qPjHtYqU7C" role="3cqZAp">
         <node concept="mw_s8" id="3qPjHtYqU7D" role="1ZfhKB">
@@ -135,6 +138,9 @@
             </node>
           </node>
         </node>
+        <node concept="1YBJjd" id="77BxNvs6uR1" role="1ZmcU8">
+          <ref role="1YBMHb" node="2lpUxXMeGs5" resolve="assertNodeEquals" />
+        </node>
       </node>
       <node concept="1ZobV4" id="2lpUxXMeYl$" role="3cqZAp">
         <property role="3wDh2S" value="true" />
@@ -155,6 +161,9 @@
             <node concept="3Tqbb2" id="2lpUxXMeYlC" role="2c44tc" />
           </node>
         </node>
+        <node concept="1YBJjd" id="77BxNvs6uR4" role="1ZmcU8">
+          <ref role="1YBMHb" node="2lpUxXMeGs5" resolve="assertNodeEquals" />
+        </node>
       </node>
       <node concept="1ZobV4" id="2lpUxXMf6TB" role="3cqZAp">
         <property role="3wDh2S" value="true" />
@@ -175,6 +184,9 @@
             <node concept="3Tqbb2" id="2lpUxXMf6TF" role="2c44tc" />
           </node>
         </node>
+        <node concept="1YBJjd" id="77BxNvs6uR7" role="1ZmcU8">
+          <ref role="1YBMHb" node="2lpUxXMeGs5" resolve="assertNodeEquals" />
+        </node>
       </node>
     </node>
     <node concept="1YaCAy" id="2lpUxXMeGs5" role="1YuTPh">
@@ -203,6 +215,9 @@
             </node>
           </node>
         </node>
+        <node concept="1YBJjd" id="77BxNvs6uX2" role="1ZmcU8">
+          <ref role="1YBMHb" node="3C6_kMLO7Z1" resolve="assertHasElements" />
+        </node>
       </node>
       <node concept="1ZobV4" id="3C6_kMLOf2c" role="3cqZAp">
         <property role="3wDh2S" value="true" />
@@ -223,6 +238,9 @@
             <node concept="10Oyi0" id="3C6_kMM0LZF" role="2c44tc" />
           </node>
         </node>
+        <node concept="1YBJjd" id="77BxNvs6uWZ" role="1ZmcU8">
+          <ref role="1YBMHb" node="3C6_kMLO7Z1" resolve="assertHasElements" />
+        </node>
       </node>
     </node>
     <node concept="1YaCAy" id="3C6_kMLO7Z1" role="1YuTPh">
@@ -256,6 +274,9 @@
             </node>
           </node>
         </node>
+        <node concept="1YBJjd" id="77BxNvs6v4$" role="1ZmcU8">
+          <ref role="1YBMHb" node="1_DWnhqnLJ$" resolve="areEqualExpression" />
+        </node>
       </node>
       <node concept="1Z5TYs" id="3qPjHtY$at_" role="3cqZAp">
         <node concept="mw_s8" id="3qPjHtY$atA" role="1ZfhKB">
@@ -279,6 +300,9 @@
             </node>
           </node>
         </node>
+        <node concept="1YBJjd" id="77BxNvs6v4x" role="1ZmcU8">
+          <ref role="1YBMHb" node="1_DWnhqnLJ$" resolve="areEqualExpression" />
+        </node>
       </node>
       <node concept="1ZobV4" id="1_DWnhqnLLU" role="3cqZAp">
         <property role="3wDh2S" value="true" />
@@ -299,6 +323,9 @@
             <node concept="3Tqbb2" id="1_DWnhqnLM2" role="2c44tc" />
           </node>
         </node>
+        <node concept="1YBJjd" id="77BxNvs6v4u" role="1ZmcU8">
+          <ref role="1YBMHb" node="1_DWnhqnLJ$" resolve="areEqualExpression" />
+        </node>
       </node>
       <node concept="1ZobV4" id="1_DWnhqnLM3" role="3cqZAp">
         <property role="3wDh2S" value="true" />
@@ -319,6 +346,9 @@
             <node concept="3Tqbb2" id="1_DWnhqnLMb" role="2c44tc" />
           </node>
         </node>
+        <node concept="1YBJjd" id="77BxNvs6v4r" role="1ZmcU8">
+          <ref role="1YBMHb" node="1_DWnhqnLJ$" resolve="areEqualExpression" />
+        </node>
       </node>
       <node concept="1Z5TYs" id="1_DWnhqnOv$" role="3cqZAp">
         <node concept="mw_s8" id="1_DWnhqnOCu" role="1ZfhKB">
@@ -337,6 +367,9 @@
             </node>
           </node>
         </node>
+        <node concept="1YBJjd" id="77BxNvs6v4o" role="1ZmcU8">
+          <ref role="1YBMHb" node="1_DWnhqnLJ$" resolve="areEqualExpression" />
+        </node>
       </node>
       <node concept="1ZoVOM" id="5qLQfLPiBfo" role="3cqZAp">
         <node concept="mw_s8" id="5qLQfLPiBfp" role="1ZfhK$">