From ed58f59794e7e36b8d1115f5b3d3e0463c8d03af Mon Sep 17 00:00:00 2001
From: Fedor Isakov <fisakov@gmail.com>
Date: Thu, 26 May 2022 09:55:21 +0200
Subject: [PATCH] Ensure all memo usages have unique keys

---
 ...ins.mps.baseLanguage.closuresExt.types.mps | 26 ++++++++++++++-----
 ...rains.mps.baseLanguage.tuplesExt.types.mps | 14 +++++++---
 .../jetbrains.mps.baseLanguageExt.types.mps   | 25 +++++++++++++-----
 .../jetbrains.mps.lang.smodelExt.types.mps    | 18 ++++++++++---
 4 files changed, 63 insertions(+), 20 deletions(-)

diff --git a/samples/mpscore/languages/jetbrains.mps.baseLanguage.closuresExt/models/jetbrains.mps.baseLanguage.closuresExt.types.mps b/samples/mpscore/languages/jetbrains.mps.baseLanguage.closuresExt/models/jetbrains.mps.baseLanguage.closuresExt.types.mps
index 6949ef53..4366e1b2 100644
--- a/samples/mpscore/languages/jetbrains.mps.baseLanguage.closuresExt/models/jetbrains.mps.baseLanguage.closuresExt.types.mps
+++ b/samples/mpscore/languages/jetbrains.mps.baseLanguage.closuresExt/models/jetbrains.mps.baseLanguage.closuresExt.types.mps
@@ -279,6 +279,7 @@
       <concept id="1803469493727536395" name="jetbrains.mps.lang.smodel.structure.OperationParm_StopConceptList" flags="ng" index="hTh3S">
         <child id="1803469493727536396" name="concept" index="hTh3Z" />
       </concept>
+      <concept id="5045161044515397667" name="jetbrains.mps.lang.smodel.structure.Node_PointerOperation" flags="ng" index="iZEcu" />
       <concept id="1179409122411" name="jetbrains.mps.lang.smodel.structure.Node_ConceptMethodCall" flags="nn" index="2qgKlT" />
       <concept id="7400021826774799413" name="jetbrains.mps.lang.smodel.structure.NodePointerExpression" flags="ng" index="2tJFMh">
         <child id="7400021826774799510" name="ref" index="2tJFKM" />
@@ -6204,8 +6205,11 @@
                 </node>
               </node>
               <node concept="1Ls8ON" id="7hlgk9K_IS7" role="21kp3f">
-                <node concept="3A2sRY" id="7hlgk9K_IS8" role="1Lso8e">
-                  <ref role="3A2yKK" node="7hlgk9K_IPE" resolve="cls" />
+                <node concept="2OqwBi" id="9UUIHKDk7v" role="1Lso8e">
+                  <node concept="3A2sRY" id="7hlgk9K_IS8" role="2Oq$k0">
+                    <ref role="3A2yKK" node="7hlgk9K_IPE" resolve="cls" />
+                  </node>
+                  <node concept="iZEcu" id="9UUIHKDlus" role="2OqNvi" />
                 </node>
                 <node concept="Xl_RD" id="7hlgk9K_IS9" role="1Lso8e">
                   <property role="Xl_RC" value="funmethod" />
@@ -6727,8 +6731,11 @@
                 </node>
               </node>
               <node concept="1Ls8ON" id="2hQbw6GLqLY" role="21kp3f">
-                <node concept="3A2sRY" id="2hQbw6GLqLZ" role="1Lso8e">
-                  <ref role="3A2yKK" node="554EtBH_$E2" resolve="cls" />
+                <node concept="2OqwBi" id="9UUIHKDl_5" role="1Lso8e">
+                  <node concept="3A2sRY" id="2hQbw6GLqLZ" role="2Oq$k0">
+                    <ref role="3A2yKK" node="554EtBH_$E2" resolve="cls" />
+                  </node>
+                  <node concept="iZEcu" id="9UUIHKDlGC" role="2OqNvi" />
                 </node>
                 <node concept="Xl_RD" id="2hQbw6GLqM0" role="1Lso8e">
                   <property role="Xl_RC" value="funmethod" />
@@ -16180,9 +16187,14 @@
                   </node>
                 </node>
               </node>
-              <node concept="2tJFMh" id="64$y60z7_2T" role="21kp3f">
-                <node concept="ZC_QK" id="64$y60z7_2U" role="2tJFKM">
-                  <ref role="2aWVGs" to="qbve:4PjiKAemR06" resolve="_FunctionTypes" />
+              <node concept="1Ls8ON" id="9UUIHKD3Xr" role="21kp3f">
+                <node concept="2tJFMh" id="64$y60z7_2T" role="1Lso8e">
+                  <node concept="ZC_QK" id="64$y60z7_2U" role="2tJFKM">
+                    <ref role="2aWVGs" to="qbve:4PjiKAemR06" resolve="_FunctionTypes" />
+                  </node>
+                </node>
+                <node concept="Xl_RD" id="9UUIHKD7Vz" role="1Lso8e">
+                  <property role="Xl_RC" value="functionType" />
                 </node>
               </node>
             </node>
diff --git a/samples/mpscore/languages/jetbrains.mps.baseLanguage.tuplesExt/models/jetbrains.mps.baseLanguage.tuplesExt.types.mps b/samples/mpscore/languages/jetbrains.mps.baseLanguage.tuplesExt/models/jetbrains.mps.baseLanguage.tuplesExt.types.mps
index 077eb5d8..07b5e31a 100644
--- a/samples/mpscore/languages/jetbrains.mps.baseLanguage.tuplesExt/models/jetbrains.mps.baseLanguage.tuplesExt.types.mps
+++ b/samples/mpscore/languages/jetbrains.mps.baseLanguage.tuplesExt/models/jetbrains.mps.baseLanguage.tuplesExt.types.mps
@@ -22,6 +22,9 @@
       <concept id="1238852151516" name="jetbrains.mps.baseLanguage.tuples.structure.IndexedTupleType" flags="in" index="1LlUBW">
         <child id="1238852204892" name="componentType" index="1Lm7xW" />
       </concept>
+      <concept id="1238853782547" name="jetbrains.mps.baseLanguage.tuples.structure.IndexedTupleLiteral" flags="nn" index="1Ls8ON">
+        <child id="1238853845806" name="component" index="1Lso8e" />
+      </concept>
     </language>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
       <concept id="1082485599095" name="jetbrains.mps.baseLanguage.structure.BlockStatement" flags="nn" index="9aQIb">
@@ -713,9 +716,14 @@
                   </node>
                 </node>
               </node>
-              <node concept="2tJFMh" id="5cBWTAdFCas" role="21kp3f">
-                <node concept="ZC_QK" id="5cBWTAdFCaQ" role="2tJFKM">
-                  <ref role="2aWVGs" to="upz5:i1Qa2bW" resolve="Tuples" />
+              <node concept="1Ls8ON" id="9UUIHKDlQw" role="21kp3f">
+                <node concept="2tJFMh" id="5cBWTAdFCas" role="1Lso8e">
+                  <node concept="ZC_QK" id="5cBWTAdFCaQ" role="2tJFKM">
+                    <ref role="2aWVGs" to="upz5:i1Qa2bW" resolve="Tuples" />
+                  </node>
+                </node>
+                <node concept="Xl_RD" id="9UUIHKDlS1" role="1Lso8e">
+                  <property role="Xl_RC" value="tuples" />
                 </node>
               </node>
             </node>
diff --git a/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/models/jetbrains.mps.baseLanguageExt.types.mps b/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/models/jetbrains.mps.baseLanguageExt.types.mps
index 01f07a05..67667e1d 100644
--- a/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/models/jetbrains.mps.baseLanguageExt.types.mps
+++ b/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/models/jetbrains.mps.baseLanguageExt.types.mps
@@ -2032,8 +2032,16 @@
                   </node>
                 </node>
               </node>
-              <node concept="3A2sRY" id="5HVB6JRf9ir" role="21kp3f">
-                <ref role="3A2yKK" node="6_5E9TNz50W" resolve="cls" />
+              <node concept="1Ls8ON" id="9UUIHKDpxC" role="21kp3f">
+                <node concept="2OqwBi" id="9UUIHKDpxD" role="1Lso8e">
+                  <node concept="3A2sRY" id="9UUIHKDpxE" role="2Oq$k0">
+                    <ref role="3A2yKK" node="6_5E9TNz50W" resolve="cls" />
+                  </node>
+                  <node concept="iZEcu" id="9UUIHKDpxF" role="2OqNvi" />
+                </node>
+                <node concept="Xl_RD" id="9UUIHKDpxG" role="1Lso8e">
+                  <property role="Xl_RC" value="vertex" />
+                </node>
               </node>
             </node>
           </node>
@@ -40349,11 +40357,16 @@
                   </node>
                 </node>
               </node>
-              <node concept="2OqwBi" id="5HVB6JRfkcY" role="21kp3f">
-                <node concept="3A2sRY" id="5HVB6JRfkcZ" role="2Oq$k0">
-                  <ref role="3A2yKK" node="29sKO70xfxm" resolve="cls" />
+              <node concept="1Ls8ON" id="9UUIHKDnaX" role="21kp3f">
+                <node concept="2OqwBi" id="5HVB6JRfkcY" role="1Lso8e">
+                  <node concept="3A2sRY" id="5HVB6JRfkcZ" role="2Oq$k0">
+                    <ref role="3A2yKK" node="29sKO70xfxm" resolve="cls" />
+                  </node>
+                  <node concept="iZEcu" id="5HVB6JRfkd0" role="2OqNvi" />
+                </node>
+                <node concept="Xl_RD" id="9UUIHKDnSt" role="1Lso8e">
+                  <property role="Xl_RC" value="vertex" />
                 </node>
-                <node concept="iZEcu" id="5HVB6JRfkd0" role="2OqNvi" />
               </node>
             </node>
           </node>
diff --git a/samples/mpscore/languages/jetbrains.mps.lang.smodelExt/models/jetbrains.mps.lang.smodelExt.types.mps b/samples/mpscore/languages/jetbrains.mps.lang.smodelExt/models/jetbrains.mps.lang.smodelExt.types.mps
index 7e300322..3bf63728 100644
--- a/samples/mpscore/languages/jetbrains.mps.lang.smodelExt/models/jetbrains.mps.lang.smodelExt.types.mps
+++ b/samples/mpscore/languages/jetbrains.mps.lang.smodelExt/models/jetbrains.mps.lang.smodelExt.types.mps
@@ -36,6 +36,11 @@
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" implicit="true" />
   </imports>
   <registry>
+    <language id="a247e09e-2435-45ba-b8d2-07e93feba96a" name="jetbrains.mps.baseLanguage.tuples">
+      <concept id="1238853782547" name="jetbrains.mps.baseLanguage.tuples.structure.IndexedTupleLiteral" flags="nn" index="1Ls8ON">
+        <child id="1238853845806" name="component" index="1Lso8e" />
+      </concept>
+    </language>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
       <concept id="1080223426719" name="jetbrains.mps.baseLanguage.structure.OrExpression" flags="nn" index="22lmx$" />
       <concept id="1082485599095" name="jetbrains.mps.baseLanguage.structure.BlockStatement" flags="nn" index="9aQIb">
@@ -6575,11 +6580,16 @@
                   </node>
                 </node>
               </node>
-              <node concept="2OqwBi" id="5HVB6JRenIa" role="21kp3f">
-                <node concept="3A2sRY" id="5HVB6JRenIb" role="2Oq$k0">
-                  <ref role="3A2yKK" node="6$6scRbXE2W" resolve="cd" />
+              <node concept="1Ls8ON" id="9UUIHKDr_D" role="21kp3f">
+                <node concept="2OqwBi" id="5HVB6JRenIa" role="1Lso8e">
+                  <node concept="3A2sRY" id="5HVB6JRenIb" role="2Oq$k0">
+                    <ref role="3A2yKK" node="6$6scRbXE2W" resolve="cd" />
+                  </node>
+                  <node concept="iZEcu" id="5HVB6JRenIc" role="2OqNvi" />
+                </node>
+                <node concept="Xl_RD" id="9UUIHKDrOp" role="1Lso8e">
+                  <property role="Xl_RC" value="vertex" />
                 </node>
-                <node concept="iZEcu" id="5HVB6JRenIc" role="2OqNvi" />
               </node>
             </node>
           </node>