From d25779439d7a33d19c46117cfe59ec07c41e7016 Mon Sep 17 00:00:00 2001
From: Alexander Rimer <rimer@itemis.de>
Date: Wed, 31 Jan 2024 12:48:29 +0100
Subject: [PATCH 01/14] expr.base: added named tuple type

is now subtype of TupleType and holds a link to the original
declaration
---
 .../models/behavior.mps                       |  58 +++--
 .../models/editor.mps                         |  25 ++-
 .../models/structure.mps                      |  22 ++
 .../models/typesystem.mps                     | 199 +++++++++++++++---
 4 files changed, 251 insertions(+), 53 deletions(-)

diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/behavior.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/behavior.mps
index 5638f1cd85..f2af361112 100755
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/behavior.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/behavior.mps
@@ -8118,7 +8118,7 @@
               <ref role="3cqZAo" node="Qsaevo33zM" resolve="expr" />
             </node>
             <node concept="37vLTw" id="5ElQ4ZyUIl" role="37wK5m">
-              <ref role="3cqZAo" node="Qsaevo35yg" resolve="ctx" />
+              <ref role="3cqZAo" node="Qsaevo35yg" resolve="context" />
             </node>
             <node concept="2ShNRf" id="5ElQ4Zz096" role="37wK5m">
               <node concept="1pGfFk" id="5ElQ4Zz3WU" role="2ShVmc">
@@ -8154,7 +8154,7 @@
               <ref role="3cqZAo" node="5ElQ4Z$IM_" resolve="expr" />
             </node>
             <node concept="37vLTw" id="5ElQ4Z$JZk" role="37wK5m">
-              <ref role="3cqZAo" node="5ElQ4Z$J$R" resolve="ctx" />
+              <ref role="3cqZAo" node="5ElQ4Z$J$R" resolve="context" />
             </node>
             <node concept="2ShNRf" id="5ElQ4Z$LEv" role="37wK5m">
               <node concept="HV5vD" id="5ElQ4Z$Mqs" role="2ShVmc">
@@ -8516,7 +8516,7 @@
               <ref role="3cqZAo" node="7p_bE3JctZw" resolve="expr" />
             </node>
             <node concept="37vLTw" id="5ElQ4Z$7xl" role="37wK5m">
-              <ref role="3cqZAo" node="7p_bE3Jcw0b" resolve="stuffForEnv" />
+              <ref role="3cqZAo" node="7p_bE3Jcw0b" resolve="environmentContent" />
             </node>
             <node concept="2ShNRf" id="5zuMBsCJxu8" role="37wK5m">
               <node concept="1pGfFk" id="5zuMBsCJxrk" role="2ShVmc">
@@ -8558,7 +8558,7 @@
               <ref role="3cqZAo" node="5ElQ4Z_71W" resolve="expr" />
             </node>
             <node concept="37vLTw" id="5ElQ4Z_71S" role="37wK5m">
-              <ref role="3cqZAo" node="5ElQ4Z_71Y" resolve="stuffForEnv" />
+              <ref role="3cqZAo" node="5ElQ4Z_71Y" resolve="environmentContent" />
             </node>
             <node concept="2ShNRf" id="5ElQ4Z_cKW" role="37wK5m">
               <node concept="HV5vD" id="5ElQ4Z_dIx" role="2ShVmc">
@@ -8664,7 +8664,7 @@
                   <node concept="liA8E" id="2nydsCfAQMF" role="2OqNvi">
                     <ref role="37wK5l" node="2nydsCf$H0v" resolve="withEnvironmentContent" />
                     <node concept="37vLTw" id="2nydsCfAS1p" role="37wK5m">
-                      <ref role="3cqZAo" node="5ElQ4ZzZbv" resolve="stuffForEnv" />
+                      <ref role="3cqZAo" node="5ElQ4ZzZbv" resolve="environmentContent" />
                     </node>
                   </node>
                 </node>
@@ -8903,7 +8903,7 @@
     </node>
     <node concept="3Tm1VV" id="3xDNhgd53EA" role="1B3o_S" />
     <node concept="2AHcQZ" id="2nydsCfyZ7D" role="2AJF6D">
-      <ref role="2AI5Lk" to="wyt6:~Deprecated" />
+      <ref role="2AI5Lk" to="wyt6:~Deprecated" resolve="Deprecated" />
     </node>
     <node concept="3UR2Jj" id="2nydsCfyZ7A" role="lGtFl">
       <node concept="TZ5HI" id="2nydsCfyZ7B" role="3nqlJM">
@@ -26526,7 +26526,7 @@
                   </node>
                 </node>
                 <node concept="2qgKlT" id="6wzrxL3bNIn" role="2OqNvi">
-                  <ref role="37wK5l" node="6wzrxL3bBWo" resolve="isProposalForThisType" />
+                  <ref role="37wK5l" node="6wzrxL3bBWo" resolve="isProposalNodeForThisType" />
                   <node concept="37vLTw" id="6wzrxL3bNTF" role="37wK5m">
                     <ref role="3cqZAo" node="6wzrxL38hF$" resolve="n" />
                   </node>
@@ -26684,7 +26684,7 @@
                 <node concept="2qgKlT" id="jqB9UdsEfF" role="2OqNvi">
                   <ref role="37wK5l" node="jqB9UdsHnW" resolve="isProposalConceptForThisType" />
                   <node concept="37vLTw" id="jqB9UdsEfG" role="37wK5m">
-                    <ref role="3cqZAo" node="jqB9UdsEfN" resolve="n" />
+                    <ref role="3cqZAo" node="jqB9UdsEfN" resolve="c" />
                   </node>
                 </node>
               </node>
@@ -26936,12 +26936,12 @@
         <node concept="3clFbF" id="2nydsCf$H0x" role="3cqZAp">
           <node concept="37vLTI" id="2nydsCf$H0y" role="3clFbG">
             <node concept="37vLTw" id="2nydsCf$H0z" role="37vLTx">
-              <ref role="3cqZAo" node="2nydsCf$H0F" resolve="interpreter" />
+              <ref role="3cqZAo" node="2nydsCf$H0F" resolve="environmentContent" />
             </node>
             <node concept="2OqwBi" id="2nydsCf$H0$" role="37vLTJ">
               <node concept="Xjq3P" id="2nydsCf$H0_" role="2Oq$k0" />
               <node concept="2OwXpG" id="2nydsCf$H0A" role="2OqNvi">
-                <ref role="2Oxat5" node="2nydsCf$Ggh" resolve="environment" />
+                <ref role="2Oxat5" node="2nydsCf$Ggh" resolve="environmentContent" />
               </node>
             </node>
           </node>
@@ -27111,7 +27111,7 @@
                     <ref role="3cqZAo" node="2nydsCfz7pp" resolve="expr" />
                   </node>
                   <node concept="37vLTw" id="2nydsCf_aku" role="37wK5m">
-                    <ref role="3cqZAo" node="2nydsCf$Ggh" resolve="environment" />
+                    <ref role="3cqZAo" node="2nydsCf$Ggh" resolve="environmentContent" />
                   </node>
                 </node>
               </node>
@@ -27120,7 +27120,7 @@
           <node concept="3y3z36" id="2nydsCf_6QE" role="3clFbw">
             <node concept="10Nm6u" id="2nydsCf_7_K" role="3uHU7w" />
             <node concept="37vLTw" id="2nydsCf_631" role="3uHU7B">
-              <ref role="3cqZAo" node="2nydsCf$Ggh" resolve="environment" />
+              <ref role="3cqZAo" node="2nydsCf$Ggh" resolve="environmentContent" />
             </node>
           </node>
         </node>
@@ -27373,5 +27373,39 @@
     </node>
     <node concept="3Tm1VV" id="2nydsCfyYD1" role="1B3o_S" />
   </node>
+  <node concept="13h7C7" id="5r47dOfJ8Us">
+    <property role="3GE5qa" value="tuples" />
+    <ref role="13h7C2" to="hm2y:5r47dOfJ8Ur" resolve="ITupleDeclaration" />
+    <node concept="13i0hz" id="5r47dOfJ8UL" role="13h7CS">
+      <property role="13i0iv" value="true" />
+      <property role="13i0it" value="true" />
+      <property role="TrG5h" value="getMembers" />
+      <node concept="3Tm1VV" id="5r47dOfJ8UM" role="1B3o_S" />
+      <node concept="2I9FWS" id="5r47dOfJ9kG" role="3clF45">
+        <ref role="2I9WkF" to="hm2y:5r47dOfJ8UC" resolve="ITupleMemberDeclaration" />
+      </node>
+      <node concept="3clFbS" id="5r47dOfJ8UO" role="3clF47" />
+    </node>
+    <node concept="13hLZK" id="5r47dOfJ8Ut" role="13h7CW">
+      <node concept="3clFbS" id="5r47dOfJ8Uu" role="2VODD2" />
+    </node>
+  </node>
+  <node concept="13h7C7" id="5r47dOg5pCc">
+    <property role="3GE5qa" value="tuples" />
+    <ref role="13h7C2" to="hm2y:5r47dOfJ8UC" resolve="ITupleMemberDeclaration" />
+    <node concept="13i0hz" id="5r47dOg5pCn" role="13h7CS">
+      <property role="13i0iv" value="true" />
+      <property role="13i0it" value="true" />
+      <property role="TrG5h" value="type" />
+      <node concept="3Tm1VV" id="5r47dOg5pCo" role="1B3o_S" />
+      <node concept="3Tqbb2" id="5r47dOg5pT$" role="3clF45">
+        <ref role="ehGHo" to="hm2y:6sdnDbSlaok" resolve="Type" />
+      </node>
+      <node concept="3clFbS" id="5r47dOg5pCq" role="3clF47" />
+    </node>
+    <node concept="13hLZK" id="5r47dOg5pCd" role="13h7CW">
+      <node concept="3clFbS" id="5r47dOg5pCe" role="2VODD2" />
+    </node>
+  </node>
 </model>
 
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/editor.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/editor.mps
index 0b7d49ba9b..69dc0c7e4b 100755
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/editor.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/editor.mps
@@ -549,6 +549,13 @@
     </language>
     <language id="7a5dda62-9140-4668-ab76-d5ed1746f2b2" name="jetbrains.mps.lang.typesystem">
       <concept id="1176544042499" name="jetbrains.mps.lang.typesystem.structure.Node_TypeOperation" flags="nn" index="3JvlWi" />
+      <concept id="1178870617262" name="jetbrains.mps.lang.typesystem.structure.CoerceExpression" flags="nn" index="1UaxmW">
+        <child id="1178870894644" name="pattern" index="1Ub_4A" />
+        <child id="1178870894645" name="nodeToCoerce" index="1Ub_4B" />
+      </concept>
+      <concept id="1174642788531" name="jetbrains.mps.lang.typesystem.structure.ConceptReference" flags="ig" index="1YaCAy">
+        <reference id="1174642800329" name="concept" index="1YaFvo" />
+      </concept>
     </language>
     <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
       <concept id="1177026924588" name="jetbrains.mps.lang.smodel.structure.RefConcept_Reference" flags="nn" index="chp4Y">
@@ -3226,16 +3233,18 @@
         <node concept="2e7140" id="5BNZGjBvzmg" role="2e1Fq_">
           <node concept="3clFbS" id="5BNZGjBvzmh" role="2VODD2">
             <node concept="3clFbF" id="5BNZGjBvznm" role="3cqZAp">
-              <node concept="2OqwBi" id="5BNZGjBvzBc" role="3clFbG">
-                <node concept="2OqwBi" id="5BNZGjBvzq4" role="2Oq$k0">
-                  <node concept="2e73FJ" id="5BNZGjBvznl" role="2Oq$k0" />
-                  <node concept="3JvlWi" id="5BNZGjBvzyr" role="2OqNvi" />
-                </node>
-                <node concept="1mIQ4w" id="5BNZGjBvzFR" role="2OqNvi">
-                  <node concept="chp4Y" id="5BNZGjBvzIb" role="cj9EA">
-                    <ref role="cht4Q" to="hm2y:S$tO8ocniU" resolve="TupleType" />
+              <node concept="2OqwBi" id="6GiZkUz4CgA" role="3clFbG">
+                <node concept="1UaxmW" id="6GiZkUz4BKU" role="2Oq$k0">
+                  <node concept="1YaCAy" id="6GiZkUz4BTr" role="1Ub_4A">
+                    <property role="TrG5h" value="tupleType" />
+                    <ref role="1YaFvo" to="hm2y:S$tO8ocniU" resolve="TupleType" />
+                  </node>
+                  <node concept="2OqwBi" id="5BNZGjBvzq4" role="1Ub_4B">
+                    <node concept="2e73FJ" id="5BNZGjBvznl" role="2Oq$k0" />
+                    <node concept="3JvlWi" id="5BNZGjBvzyr" role="2OqNvi" />
                   </node>
                 </node>
+                <node concept="3x8VRR" id="6GiZkUz4CCA" role="2OqNvi" />
               </node>
             </node>
           </node>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/structure.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/structure.mps
index 393613491a..d9ec023b64 100755
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/structure.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/structure.mps
@@ -2193,5 +2193,27 @@
     <property role="EcuMT" value="7503962471793758868" />
     <property role="TrG5h" value="IPreferredProposalContext" />
   </node>
+  <node concept="PlHQZ" id="5r47dOfJ8Ur">
+    <property role="TrG5h" value="ITupleDeclaration" />
+    <property role="3GE5qa" value="tuples" />
+    <property role="EcuMT" value="6252153918474456730" />
+  </node>
+  <node concept="PlHQZ" id="5r47dOfJ8UC">
+    <property role="TrG5h" value="ITupleMemberDeclaration" />
+    <property role="3GE5qa" value="tuples" />
+    <property role="EcuMT" value="6252153918474456743" />
+  </node>
+  <node concept="1TIwiD" id="5r47dOfJ9kS">
+    <property role="EcuMT" value="6252153918474458424" />
+    <property role="3GE5qa" value="tuples" />
+    <property role="TrG5h" value="NamedTupleType" />
+    <ref role="1TJDcQ" node="6sdnDbSlaok" resolve="Type" />
+    <node concept="1TJgyj" id="5r47dOfJ9kT" role="1TKVEi">
+      <property role="IQ2ns" value="6252153918474458425" />
+      <property role="20kJfa" value="decl" />
+      <property role="20lbJX" value="fLJekj4/_1" />
+      <ref role="20lvS9" node="5r47dOfJ8Ur" resolve="ITupleDeclaration" />
+    </node>
+  </node>
 </model>
 
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/typesystem.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/typesystem.mps
index 779a969695..7c1ebd0210 100755
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/typesystem.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/typesystem.mps
@@ -326,6 +326,10 @@
       </concept>
       <concept id="1176544042499" name="jetbrains.mps.lang.typesystem.structure.Node_TypeOperation" flags="nn" index="3JvlWi" />
       <concept id="6136676636349908958" name="jetbrains.mps.lang.typesystem.structure.OverloadedOpIsApplicableFunction" flags="in" index="1QeDOX" />
+      <concept id="1178870617262" name="jetbrains.mps.lang.typesystem.structure.CoerceExpression" flags="nn" index="1UaxmW">
+        <child id="1178870894644" name="pattern" index="1Ub_4A" />
+        <child id="1178870894645" name="nodeToCoerce" index="1Ub_4B" />
+      </concept>
       <concept id="1174642788531" name="jetbrains.mps.lang.typesystem.structure.ConceptReference" flags="ig" index="1YaCAy">
         <reference id="1174642800329" name="concept" index="1YaFvo" />
       </concept>
@@ -6115,17 +6119,18 @@
             <node concept="mw_s8" id="2ck7OjOM9Hk" role="1ZfhKB">
               <node concept="2OqwBi" id="2ck7OjOMayN" role="mwGJk">
                 <node concept="2OqwBi" id="2ck7OjOM9U0" role="2Oq$k0">
-                  <node concept="1PxgMI" id="2ck7OjOM9Py" role="2Oq$k0">
-                    <node concept="chp4Y" id="6b_jefnKxAy" role="3oSUPX">
-                      <ref role="cht4Q" to="hm2y:S$tO8ocniU" resolve="TupleType" />
+                  <node concept="3Tsc0h" id="2ck7OjOMa0k" role="2OqNvi">
+                    <ref role="3TtcxE" to="hm2y:S$tO8ocniV" resolve="elementTypes" />
+                  </node>
+                  <node concept="1UaxmW" id="6GiZkUyXeak" role="2Oq$k0">
+                    <node concept="1YaCAy" id="6GiZkUyXeal" role="1Ub_4A">
+                      <property role="TrG5h" value="tupleType" />
+                      <ref role="1YaFvo" to="hm2y:S$tO8ocniU" resolve="TupleType" />
                     </node>
-                    <node concept="2X3wrD" id="2ck7OjOMdu3" role="1m5AlR">
+                    <node concept="2X3wrD" id="6GiZkUyXeam" role="1Ub_4B">
                       <ref role="2X3Bk0" node="2ck7OjOMdp5" resolve="tt" />
                     </node>
                   </node>
-                  <node concept="3Tsc0h" id="2ck7OjOMa0k" role="2OqNvi">
-                    <ref role="3TtcxE" to="hm2y:S$tO8ocniV" resolve="elementTypes" />
-                  </node>
                 </node>
                 <node concept="34jXtK" id="2ck7OjOMbqs" role="2OqNvi">
                   <node concept="2OqwBi" id="2ck7OjOMbtW" role="25WWJ7">
@@ -6181,20 +6186,21 @@
               <node concept="3Tqbb2" id="2ck7OjOM26v" role="1tU5fm">
                 <ref role="ehGHo" to="hm2y:S$tO8ocniU" resolve="TupleType" />
               </node>
-              <node concept="1PxgMI" id="2ck7OjOM26y" role="33vP2m">
-                <node concept="chp4Y" id="6b_jefnKxAr" role="3oSUPX">
-                  <ref role="cht4Q" to="hm2y:S$tO8ocniU" resolve="TupleType" />
+              <node concept="1UaxmW" id="6GiZkUz1ubv" role="33vP2m">
+                <node concept="1YaCAy" id="6GiZkUz1ubw" role="1Ub_4A">
+                  <property role="TrG5h" value="tupleType" />
+                  <ref role="1YaFvo" to="hm2y:S$tO8ocniU" resolve="TupleType" />
                 </node>
-                <node concept="2OqwBi" id="2ck7OjOM26z" role="1m5AlR">
-                  <node concept="2OqwBi" id="2ck7OjOMkSa" role="2Oq$k0">
-                    <node concept="1YBJjd" id="2ck7OjOM26$" role="2Oq$k0">
+                <node concept="2OqwBi" id="6GiZkUz1zjJ" role="1Ub_4B">
+                  <node concept="2OqwBi" id="6GiZkUz1uZ4" role="2Oq$k0">
+                    <node concept="1YBJjd" id="6GiZkUz1uMi" role="2Oq$k0">
                       <ref role="1YBMHb" node="2ck7OjOM1no" resolve="tae" />
                     </node>
-                    <node concept="3TrEf2" id="2ck7OjOMl0k" role="2OqNvi">
+                    <node concept="3TrEf2" id="6GiZkUz1v$9" role="2OqNvi">
                       <ref role="3Tt5mk" to="hm2y:2ck7OjOLg5_" resolve="tuple" />
                     </node>
                   </node>
-                  <node concept="3JvlWi" id="2ck7OjOM26_" role="2OqNvi" />
+                  <node concept="3JvlWi" id="6GiZkUz1zJ9" role="2OqNvi" />
                 </node>
               </node>
             </node>
@@ -6215,17 +6221,18 @@
                 <node concept="2d3UOw" id="2ck7OjOLCdH" role="3clFbw">
                   <node concept="2OqwBi" id="2ck7OjOLDhP" role="3uHU7w">
                     <node concept="2OqwBi" id="2ck7OjOLCwO" role="2Oq$k0">
-                      <node concept="1PxgMI" id="2ck7OjOLCox" role="2Oq$k0">
-                        <node concept="chp4Y" id="6b_jefnKxA8" role="3oSUPX">
-                          <ref role="cht4Q" to="hm2y:S$tO8ocniU" resolve="TupleType" />
+                      <node concept="3Tsc0h" id="2ck7OjOLCAq" role="2OqNvi">
+                        <ref role="3TtcxE" to="hm2y:S$tO8ocniV" resolve="elementTypes" />
+                      </node>
+                      <node concept="1UaxmW" id="6GiZkUz398A" role="2Oq$k0">
+                        <node concept="1YaCAy" id="6GiZkUz398B" role="1Ub_4A">
+                          <property role="TrG5h" value="tupleType" />
+                          <ref role="1YaFvo" to="hm2y:S$tO8ocniU" resolve="TupleType" />
                         </node>
-                        <node concept="37vLTw" id="2ck7OjOM2el" role="1m5AlR">
+                        <node concept="37vLTw" id="6GiZkUz39$o" role="1Ub_4B">
                           <ref role="3cqZAo" node="2ck7OjOM26x" resolve="tt" />
                         </node>
                       </node>
-                      <node concept="3Tsc0h" id="2ck7OjOLCAq" role="2OqNvi">
-                        <ref role="3TtcxE" to="hm2y:S$tO8ocniV" resolve="elementTypes" />
-                      </node>
                     </node>
                     <node concept="34oBXx" id="2ck7OjOLEXG" role="2OqNvi" />
                   </node>
@@ -6252,21 +6259,41 @@
             </node>
           </node>
         </node>
-        <node concept="2OqwBi" id="2ck7OjOM1C4" role="3clFbw">
-          <node concept="2OqwBi" id="2ck7OjOM1vP" role="2Oq$k0">
-            <node concept="2OqwBi" id="2ck7OjOM76w" role="2Oq$k0">
-              <node concept="1YBJjd" id="2ck7OjOM1tS" role="2Oq$k0">
-                <ref role="1YBMHb" node="2ck7OjOM1no" resolve="tae" />
+        <node concept="22lmx$" id="6GiZkUz2vCI" role="3clFbw">
+          <node concept="2OqwBi" id="2ck7OjOM1C4" role="3uHU7B">
+            <node concept="2OqwBi" id="2ck7OjOM1vP" role="2Oq$k0">
+              <node concept="2OqwBi" id="2ck7OjOM76w" role="2Oq$k0">
+                <node concept="1YBJjd" id="2ck7OjOM1tS" role="2Oq$k0">
+                  <ref role="1YBMHb" node="2ck7OjOM1no" resolve="tae" />
+                </node>
+                <node concept="3TrEf2" id="2ck7OjOM7mV" role="2OqNvi">
+                  <ref role="3Tt5mk" to="hm2y:2ck7OjOLg5_" resolve="tuple" />
+                </node>
               </node>
-              <node concept="3TrEf2" id="2ck7OjOM7mV" role="2OqNvi">
-                <ref role="3Tt5mk" to="hm2y:2ck7OjOLg5_" resolve="tuple" />
+              <node concept="3JvlWi" id="2ck7OjOM1z_" role="2OqNvi" />
+            </node>
+            <node concept="1mIQ4w" id="2ck7OjOM1F_" role="2OqNvi">
+              <node concept="chp4Y" id="2ck7OjOM1G6" role="cj9EA">
+                <ref role="cht4Q" to="hm2y:S$tO8ocniU" resolve="TupleType" />
               </node>
             </node>
-            <node concept="3JvlWi" id="2ck7OjOM1z_" role="2OqNvi" />
           </node>
-          <node concept="1mIQ4w" id="2ck7OjOM1F_" role="2OqNvi">
-            <node concept="chp4Y" id="2ck7OjOM1G6" role="cj9EA">
-              <ref role="cht4Q" to="hm2y:S$tO8ocniU" resolve="TupleType" />
+          <node concept="2OqwBi" id="6GiZkUz2vUl" role="3uHU7w">
+            <node concept="2OqwBi" id="6GiZkUz2vUm" role="2Oq$k0">
+              <node concept="2OqwBi" id="6GiZkUz2vUn" role="2Oq$k0">
+                <node concept="1YBJjd" id="6GiZkUz2vUo" role="2Oq$k0">
+                  <ref role="1YBMHb" node="2ck7OjOM1no" resolve="tae" />
+                </node>
+                <node concept="3TrEf2" id="6GiZkUz2vUp" role="2OqNvi">
+                  <ref role="3Tt5mk" to="hm2y:2ck7OjOLg5_" resolve="tuple" />
+                </node>
+              </node>
+              <node concept="3JvlWi" id="6GiZkUz2vUq" role="2OqNvi" />
+            </node>
+            <node concept="1mIQ4w" id="6GiZkUz2vUr" role="2OqNvi">
+              <node concept="chp4Y" id="6GiZkUz2vUs" role="cj9EA">
+                <ref role="cht4Q" to="hm2y:5r47dOfJ9kS" resolve="NamedTupleType" />
+              </node>
             </node>
           </node>
         </node>
@@ -10792,5 +10819,111 @@
       <ref role="1YaFvo" to="hm2y:xG0f0hk3ZX" resolve="IfElseSection" />
     </node>
   </node>
+  <node concept="2sgARr" id="5r47dOg5h97">
+    <property role="3GE5qa" value="tuples" />
+    <property role="TrG5h" value="NamedTupleType_is_subtype_of_TupleType" />
+    <node concept="3clFbS" id="5r47dOg5h98" role="2sgrp5">
+      <node concept="3cpWs8" id="5r47dOg5hYf" role="3cqZAp">
+        <node concept="3cpWsn" id="5r47dOg5hYg" role="3cpWs9">
+          <property role="TrG5h" value="tupleTypes" />
+          <node concept="2I9FWS" id="5r47dOg5hYh" role="1tU5fm" />
+          <node concept="2ShNRf" id="5r47dOg5hYi" role="33vP2m">
+            <node concept="2T8Vx0" id="5r47dOg5hYj" role="2ShVmc">
+              <node concept="2I9FWS" id="5r47dOg5hYk" role="2T96Bj" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3cpWs8" id="5r47dOg5jua" role="3cqZAp">
+        <node concept="3cpWsn" id="5r47dOg5jub" role="3cpWs9">
+          <property role="TrG5h" value="tt" />
+          <node concept="3Tqbb2" id="5r47dOg5i45" role="1tU5fm">
+            <ref role="ehGHo" to="hm2y:S$tO8ocniU" resolve="TupleType" />
+          </node>
+          <node concept="2ShNRf" id="5r47dOg5juc" role="33vP2m">
+            <node concept="3zrR0B" id="5r47dOg5jud" role="2ShVmc">
+              <node concept="3Tqbb2" id="5r47dOg5jue" role="3zrR0E">
+                <ref role="ehGHo" to="hm2y:S$tO8ocniU" resolve="TupleType" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3clFbF" id="5r47dOg5hYl" role="3cqZAp">
+        <node concept="2OqwBi" id="5r47dOg5hYm" role="3clFbG">
+          <node concept="37vLTw" id="5r47dOg5hYn" role="2Oq$k0">
+            <ref role="3cqZAo" node="5r47dOg5hYg" resolve="tupleTypes" />
+          </node>
+          <node concept="TSZUe" id="5r47dOg5hYo" role="2OqNvi">
+            <node concept="37vLTw" id="5r47dOg5juf" role="25WWJ7">
+              <ref role="3cqZAo" node="5r47dOg5jub" resolve="tt" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3clFbF" id="5r47dOg5jNV" role="3cqZAp">
+        <node concept="2OqwBi" id="6GiZkUySE_T" role="3clFbG">
+          <node concept="2OqwBi" id="6GiZkUySCfy" role="2Oq$k0">
+            <node concept="37vLTw" id="6GiZkUySC5a" role="2Oq$k0">
+              <ref role="3cqZAo" node="5r47dOg5jub" resolve="tt" />
+            </node>
+            <node concept="3Tsc0h" id="6GiZkUySCui" role="2OqNvi">
+              <ref role="3TtcxE" to="hm2y:S$tO8ocniV" resolve="elementTypes" />
+            </node>
+          </node>
+          <node concept="X8dFx" id="6GiZkUySIha" role="2OqNvi">
+            <node concept="2OqwBi" id="5r47dOg5miZ" role="25WWJ7">
+              <node concept="2OqwBi" id="5r47dOg5kT8" role="2Oq$k0">
+                <node concept="2OqwBi" id="5r47dOg5jYB" role="2Oq$k0">
+                  <node concept="1YBJjd" id="5r47dOg5jNT" role="2Oq$k0">
+                    <ref role="1YBMHb" node="5r47dOg5h9a" resolve="tt2" />
+                  </node>
+                  <node concept="3TrEf2" id="5r47dOg5kur" role="2OqNvi">
+                    <ref role="3Tt5mk" to="hm2y:5r47dOfJ9kT" resolve="decl" />
+                  </node>
+                </node>
+                <node concept="2qgKlT" id="5r47dOg5l6f" role="2OqNvi">
+                  <ref role="37wK5l" to="pbu6:5r47dOfJ8UL" resolve="getMembers" />
+                </node>
+              </node>
+              <node concept="3$u5V9" id="5r47dOg5oGO" role="2OqNvi">
+                <node concept="1bVj0M" id="5r47dOg5oGQ" role="23t8la">
+                  <node concept="3clFbS" id="5r47dOg5oGR" role="1bW5cS">
+                    <node concept="3clFbF" id="5r47dOg5qb6" role="3cqZAp">
+                      <node concept="2OqwBi" id="6GiZkUySAEG" role="3clFbG">
+                        <node concept="2OqwBi" id="5r47dOghClp" role="2Oq$k0">
+                          <node concept="37vLTw" id="5r47dOghCas" role="2Oq$k0">
+                            <ref role="3cqZAo" node="5r47dOg5oGS" resolve="it" />
+                          </node>
+                          <node concept="2qgKlT" id="5r47dOghD5z" role="2OqNvi">
+                            <ref role="37wK5l" to="pbu6:5r47dOg5pCn" resolve="type" />
+                          </node>
+                        </node>
+                        <node concept="1$rogu" id="6GiZkUySBqu" role="2OqNvi" />
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="Rh6nW" id="5r47dOg5oGS" role="1bW2Oz">
+                    <property role="TrG5h" value="it" />
+                    <node concept="2jxLKc" id="5r47dOg5oGT" role="1tU5fm" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3clFbH" id="5r47dOgivdS" role="3cqZAp" />
+      <node concept="3cpWs6" id="5r47dOgivft" role="3cqZAp">
+        <node concept="37vLTw" id="5r47dOgivEn" role="3cqZAk">
+          <ref role="3cqZAo" node="5r47dOg5hYg" resolve="tupleTypes" />
+        </node>
+      </node>
+    </node>
+    <node concept="1YaCAy" id="5r47dOg5h9a" role="1YuTPh">
+      <property role="TrG5h" value="tt2" />
+      <ref role="1YaFvo" to="hm2y:5r47dOfJ9kS" resolve="NamedTupleType" />
+    </node>
+  </node>
 </model>
 

From 69348d28bbbc1123ab9f46e2750fcd01ae7ee289 Mon Sep 17 00:00:00 2001
From: Alexander Rimer <rimer@itemis.de>
Date: Wed, 31 Jan 2024 12:51:40 +0100
Subject: [PATCH 02/14] expr.util: MutliDeclTables uses NamedTupleType

added TS coerce rules to allow backwards compatiblity on TS level
---
 build/scripts/build-allScripts.xml            |  1 +
 .../models/typesystem.mps                     | 13 +++--
 .../models/behavior.mps                       | 46 ++++++++++++++++
 .../models/structure.mps                      |  6 +++
 .../models/typesystem.mps                     | 52 +++++++------------
 5 files changed, 80 insertions(+), 38 deletions(-)

diff --git a/build/scripts/build-allScripts.xml b/build/scripts/build-allScripts.xml
index 027caa1ab3..233102705c 100644
--- a/build/scripts/build-allScripts.xml
+++ b/build/scripts/build-allScripts.xml
@@ -225,6 +225,7 @@
       <library file="${artifacts.mps}/languages/runtimes/jetbrains.mps.lang.constraints.rules.runtime.jar" />
       <library file="${artifacts.mps}/languages/runtimes/jetbrains.mps.lang.feedback.api.jar" />
       <library file="${artifacts.mps}/languages/runtimes/jetbrains.mps.lang.feedback.context.jar" />
+      <library file="${artifacts.mps}/languages/runtimes/jetbrains.mps.lang.feedback.problem.legacy-constraints.jar" />
       <library file="${artifacts.mps}/languages/runtimes/jetbrains.mps.lang.feedback.problem.rt.jar" />
       <library file="${artifacts.mps}/languages/runtimes/jetbrains.mps.lang.feedback.problem.rules.jar" />
       <library file="${artifacts.mps}/languages/runtimes/jetbrains.mps.lang.messages.api.jar" />
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.collections/models/typesystem.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.collections/models/typesystem.mps
index 54e18f0aae..213b7e7598 100755
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.collections/models/typesystem.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.collections/models/typesystem.mps
@@ -219,6 +219,10 @@
         <child id="1210784642750" name="value" index="3CoRuB" />
       </concept>
       <concept id="1176544042499" name="jetbrains.mps.lang.typesystem.structure.Node_TypeOperation" flags="nn" index="3JvlWi" />
+      <concept id="1178870617262" name="jetbrains.mps.lang.typesystem.structure.CoerceExpression" flags="nn" index="1UaxmW">
+        <child id="1178870894644" name="pattern" index="1Ub_4A" />
+        <child id="1178870894645" name="nodeToCoerce" index="1Ub_4B" />
+      </concept>
       <concept id="1174642788531" name="jetbrains.mps.lang.typesystem.structure.ConceptReference" flags="ig" index="1YaCAy">
         <reference id="1174642800329" name="concept" index="1YaFvo" />
       </concept>
@@ -5441,11 +5445,12 @@
                   <node concept="3Tqbb2" id="1mDdTGUIpI" role="1tU5fm">
                     <ref role="ehGHo" to="hm2y:S$tO8ocniU" resolve="TupleType" />
                   </node>
-                  <node concept="1PxgMI" id="1mDdTGUIpS" role="33vP2m">
-                    <node concept="chp4Y" id="1mDdTGUIpT" role="3oSUPX">
-                      <ref role="cht4Q" to="hm2y:S$tO8ocniU" resolve="TupleType" />
+                  <node concept="1UaxmW" id="6GiZkUyXeak" role="33vP2m">
+                    <node concept="1YaCAy" id="6GiZkUyXeal" role="1Ub_4A">
+                      <property role="TrG5h" value="tupleType" />
+                      <ref role="1YaFvo" to="hm2y:S$tO8ocniU" resolve="TupleType" />
                     </node>
-                    <node concept="37vLTw" id="1mDdTGUIpU" role="1m5AlR">
+                    <node concept="37vLTw" id="6GiZkUz1sX2" role="1Ub_4B">
                       <ref role="3cqZAo" node="1mDdTGU9aR" resolve="baseType" />
                     </node>
                   </node>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.util/models/behavior.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.util/models/behavior.mps
index 9ff639c87a..a3f195a8ad 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.util/models/behavior.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.util/models/behavior.mps
@@ -3129,6 +3129,34 @@
         </node>
       </node>
     </node>
+    <node concept="13i0hz" id="5r47dOfJjIl" role="13h7CS">
+      <property role="TrG5h" value="getMembers" />
+      <ref role="13i0hy" to="pbu6:5r47dOfJ8UL" resolve="getMembers" />
+      <node concept="3Tm1VV" id="5r47dOfJjIm" role="1B3o_S" />
+      <node concept="3clFbS" id="5r47dOfJjIp" role="3clF47">
+        <node concept="3clFbF" id="5r47dOg5_j5" role="3cqZAp">
+          <node concept="2OqwBi" id="5r47dOg5Leb" role="3clFbG">
+            <node concept="2OqwBi" id="5r47dOg5H1I" role="2Oq$k0">
+              <node concept="2OqwBi" id="5r47dOg5_FQ" role="2Oq$k0">
+                <node concept="13iPFW" id="5r47dOg5_j4" role="2Oq$k0" />
+                <node concept="2qgKlT" id="5r47dOg5AnH" role="2OqNvi">
+                  <ref role="37wK5l" node="7FuUjk_57S0" resolve="resultColDefs" />
+                </node>
+              </node>
+              <node concept="v3k3i" id="5r47dOg5HxN" role="2OqNvi">
+                <node concept="chp4Y" id="5r47dOg5Hz0" role="v3oSu">
+                  <ref role="cht4Q" to="kfo3:8XWEtdX_Yl" resolve="ResultColDef" />
+                </node>
+              </node>
+            </node>
+            <node concept="ANE8D" id="5r47dOg5LIF" role="2OqNvi" />
+          </node>
+        </node>
+      </node>
+      <node concept="2I9FWS" id="5r47dOfJjIq" role="3clF45">
+        <ref role="2I9WkF" to="hm2y:5r47dOfJ8UC" resolve="ITupleMemberDeclaration" />
+      </node>
+    </node>
   </node>
   <node concept="13h7C7" id="8XWEtejPi_">
     <property role="3GE5qa" value="multidectab.expr" />
@@ -5949,6 +5977,24 @@
       </node>
       <node concept="10P_77" id="4jTzL4SDZcl" role="3clF45" />
     </node>
+    <node concept="13i0hz" id="5r47dOg5DlB" role="13h7CS">
+      <property role="TrG5h" value="type" />
+      <ref role="13i0hy" to="pbu6:5r47dOg5pCn" resolve="type" />
+      <node concept="3Tm1VV" id="5r47dOg5DlC" role="1B3o_S" />
+      <node concept="3clFbS" id="5r47dOg5DlF" role="3clF47">
+        <node concept="3clFbF" id="5r47dOg5Dof" role="3cqZAp">
+          <node concept="2OqwBi" id="5r47dOg5DBx" role="3clFbG">
+            <node concept="13iPFW" id="5r47dOg5Doe" role="2Oq$k0" />
+            <node concept="3TrEf2" id="5r47dOg5EQT" role="2OqNvi">
+              <ref role="3Tt5mk" to="kfo3:8XWEtdX_Yo" resolve="type" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3Tqbb2" id="5r47dOg5DlG" role="3clF45">
+        <ref role="ehGHo" to="hm2y:6sdnDbSlaok" resolve="Type" />
+      </node>
+    </node>
   </node>
 </model>
 
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.util/models/structure.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.util/models/structure.mps
index 7f278211e3..669522a039 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.util/models/structure.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.util/models/structure.mps
@@ -479,6 +479,9 @@
     <node concept="PrWs8" id="6OunYCf7fuw" role="PzmwI">
       <ref role="PrY4T" to="4kwy:cJpacq5T0O" resolve="IValidNamedConcept" />
     </node>
+    <node concept="PrWs8" id="5r47dOg5Dis" role="PzmwI">
+      <ref role="PrY4T" to="hm2y:5r47dOfJ8UC" resolve="ITupleMemberDeclaration" />
+    </node>
   </node>
   <node concept="1TIwiD" id="8XWEtdYdD1">
     <property role="EcuMT" value="161551962036820545" />
@@ -607,6 +610,9 @@
     <node concept="PrWs8" id="7vcJOhhDND5" role="PrDN$">
       <ref role="PrY4T" node="22hm_0zj$RB" resolve="IRangeContext" />
     </node>
+    <node concept="PrWs8" id="6GiZkUyVeSf" role="PrDN$">
+      <ref role="PrY4T" to="hm2y:5r47dOfJ8Ur" resolve="ITupleDeclaration" />
+    </node>
   </node>
   <node concept="1TIwiD" id="7FuUjk_mXBJ">
     <property role="EcuMT" value="8853770331926288879" />
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.util/models/typesystem.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.util/models/typesystem.mps
index e0023e2a48..ccd3a05ec4 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.util/models/typesystem.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.util/models/typesystem.mps
@@ -22,6 +22,10 @@
       <concept id="1082485599095" name="jetbrains.mps.baseLanguage.structure.BlockStatement" flags="nn" index="9aQIb">
         <child id="1082485599096" name="statements" index="9aQI4" />
       </concept>
+      <concept id="1215693861676" name="jetbrains.mps.baseLanguage.structure.BaseAssignmentExpression" flags="nn" index="d038R">
+        <child id="1068498886297" name="rValue" index="37vLTx" />
+        <child id="1068498886295" name="lValue" index="37vLTJ" />
+      </concept>
       <concept id="4836112446988635817" name="jetbrains.mps.baseLanguage.structure.UndefinedType" flags="in" index="2jxLKc" />
       <concept id="1154032098014" name="jetbrains.mps.baseLanguage.structure.AbstractLoopStatement" flags="nn" index="2LF5Ji">
         <child id="1154032183016" name="body" index="2LFqv$" />
@@ -49,6 +53,7 @@
       <concept id="1068498886296" name="jetbrains.mps.baseLanguage.structure.VariableReference" flags="nn" index="37vLTw">
         <reference id="1068581517664" name="variableDeclaration" index="3cqZAo" />
       </concept>
+      <concept id="1068498886294" name="jetbrains.mps.baseLanguage.structure.AssignmentExpression" flags="nn" index="37vLTI" />
       <concept id="4972933694980447171" name="jetbrains.mps.baseLanguage.structure.BaseVariableDeclaration" flags="ng" index="19Szcq">
         <child id="5680397130376446158" name="type" index="1tU5fm" />
       </concept>
@@ -238,7 +243,6 @@
       <concept id="1180636770613" name="jetbrains.mps.lang.smodel.structure.SNodeCreator" flags="nn" index="3zrR0B">
         <child id="1180636770616" name="createdType" index="3zrR0E" />
       </concept>
-      <concept id="1144146199828" name="jetbrains.mps.lang.smodel.structure.Node_CopyOperation" flags="nn" index="1$rogu" />
       <concept id="1140137987495" name="jetbrains.mps.lang.smodel.structure.SNodeTypeCastExpression" flags="nn" index="1PxgMI" />
       <concept id="1138055754698" name="jetbrains.mps.lang.smodel.structure.SNodeType" flags="in" index="3Tqbb2">
         <reference id="1138405853777" name="concept" index="ehGHo" />
@@ -1587,48 +1591,28 @@
               <node concept="3cpWsn" id="8XWEte6_8s" role="3cpWs9">
                 <property role="TrG5h" value="tt" />
                 <node concept="3Tqbb2" id="8XWEte6_8o" role="1tU5fm">
-                  <ref role="ehGHo" to="hm2y:S$tO8ocniU" resolve="TupleType" />
+                  <ref role="ehGHo" to="hm2y:5r47dOfJ9kS" resolve="TupleType2" />
                 </node>
                 <node concept="2ShNRf" id="8XWEte6_8S" role="33vP2m">
                   <node concept="3zrR0B" id="8XWEte6_8I" role="2ShVmc">
                     <node concept="3Tqbb2" id="8XWEte6_8J" role="3zrR0E">
-                      <ref role="ehGHo" to="hm2y:S$tO8ocniU" resolve="TupleType" />
+                      <ref role="ehGHo" to="hm2y:5r47dOfJ9kS" resolve="TupleType2" />
                     </node>
                   </node>
                 </node>
               </node>
             </node>
-            <node concept="2Gpval" id="8XWEte6BhG" role="3cqZAp">
-              <node concept="2GrKxI" id="8XWEte6BhI" role="2Gsz3X">
-                <property role="TrG5h" value="rcd" />
-              </node>
-              <node concept="37vLTw" id="8XWEte6Big" role="2GsD0m">
-                <ref role="3cqZAo" node="8XWEte6zuP" resolve="rcds" />
-              </node>
-              <node concept="3clFbS" id="8XWEte6BhM" role="2LFqv$">
-                <node concept="3clFbF" id="8XWEte6BiO" role="3cqZAp">
-                  <node concept="2OqwBi" id="8XWEte6Dcv" role="3clFbG">
-                    <node concept="2OqwBi" id="8XWEte6Br3" role="2Oq$k0">
-                      <node concept="37vLTw" id="8XWEte6BiN" role="2Oq$k0">
-                        <ref role="3cqZAo" node="8XWEte6_8s" resolve="tt" />
-                      </node>
-                      <node concept="3Tsc0h" id="8XWEte6Bz$" role="2OqNvi">
-                        <ref role="3TtcxE" to="hm2y:S$tO8ocniV" resolve="elementTypes" />
-                      </node>
-                    </node>
-                    <node concept="TSZUe" id="8XWEte6Exx" role="2OqNvi">
-                      <node concept="2OqwBi" id="8XWEte6FJD" role="25WWJ7">
-                        <node concept="2OqwBi" id="8XWEte6EYQ" role="2Oq$k0">
-                          <node concept="2GrUjf" id="8XWEte6EF3" role="2Oq$k0">
-                            <ref role="2Gs0qQ" node="8XWEte6BhI" resolve="rcd" />
-                          </node>
-                          <node concept="3TrEf2" id="8XWEte6FhE" role="2OqNvi">
-                            <ref role="3Tt5mk" to="kfo3:8XWEtdX_Yo" resolve="type" />
-                          </node>
-                        </node>
-                        <node concept="1$rogu" id="8XWEte6G86" role="2OqNvi" />
-                      </node>
-                    </node>
+            <node concept="3clFbF" id="6GiZkUyYhPC" role="3cqZAp">
+              <node concept="37vLTI" id="6GiZkUyYirv" role="3clFbG">
+                <node concept="1YBJjd" id="6GiZkUz76vh" role="37vLTx">
+                  <ref role="1YBMHb" node="8XWEte6nsv" resolve="iMultiDecTab" />
+                </node>
+                <node concept="2OqwBi" id="6GiZkUyYi0f" role="37vLTJ">
+                  <node concept="37vLTw" id="6GiZkUyYhPA" role="2Oq$k0">
+                    <ref role="3cqZAo" node="8XWEte6_8s" resolve="tt" />
+                  </node>
+                  <node concept="3TrEf2" id="6GiZkUyYigD" role="2OqNvi">
+                    <ref role="3Tt5mk" to="hm2y:5r47dOfJ9kT" resolve="decl" />
                   </node>
                 </node>
               </node>

From 8c7dc8388f0c6829bb276efc3cba190dab317466 Mon Sep 17 00:00:00 2001
From: Alexander Rimer <rimer@itemis.de>
Date: Wed, 31 Jan 2024 13:15:27 +0100
Subject: [PATCH 03/14] expr.base: added inlined tuple access target

enable name based access of tuple members.
---
 .../models/behavior.mps                       |  99 +++++++++
 .../models/constraints.mps                    |  31 +++
 .../models/editor.mps                         | 192 ++++++++++++++++++
 .../models/structure.mps                      |  21 ++
 .../models/typesystem.mps                     | 137 +++++++++++++
 5 files changed, 480 insertions(+)

diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/behavior.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/behavior.mps
index f2af361112..69fab1cba9 100755
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/behavior.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/behavior.mps
@@ -27407,5 +27407,104 @@
       <node concept="3clFbS" id="5r47dOg5pCe" role="2VODD2" />
     </node>
   </node>
+  <node concept="13h7C7" id="6GiZkUz7qWV">
+    <property role="3GE5qa" value="tuples" />
+    <ref role="13h7C2" to="hm2y:6GiZkUz7qWO" resolve="InlinedNamedTupleAccess" />
+    <node concept="13hLZK" id="6GiZkUz7qWW" role="13h7CW">
+      <node concept="3clFbS" id="6GiZkUz7qWX" role="2VODD2" />
+    </node>
+    <node concept="13i0hz" id="6GiZkUz7qX6" role="13h7CS">
+      <property role="TrG5h" value="renderReadable" />
+      <ref role="13i0hy" node="6kR0qIbI2yi" resolve="renderReadable" />
+      <node concept="3Tm1VV" id="6GiZkUz7qX7" role="1B3o_S" />
+      <node concept="3clFbS" id="6GiZkUz7qXa" role="3clF47">
+        <node concept="3clFbF" id="6GiZkUz7Aah" role="3cqZAp">
+          <node concept="2OqwBi" id="6GiZkUz7AIH" role="3clFbG">
+            <node concept="2OqwBi" id="6GiZkUz7AkM" role="2Oq$k0">
+              <node concept="13iPFW" id="6GiZkUz7Aae" role="2Oq$k0" />
+              <node concept="3TrEf2" id="6GiZkUz7A_H" role="2OqNvi">
+                <ref role="3Tt5mk" to="hm2y:6GiZkUz7r1V" resolve="member" />
+              </node>
+            </node>
+            <node concept="3TrcHB" id="6GiZkUz7ASw" role="2OqNvi">
+              <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="17QB3L" id="6GiZkUz7qXb" role="3clF45" />
+    </node>
+    <node concept="13i0hz" id="6GiZkUzfnDf" role="13h7CS">
+      <property role="TrG5h" value="expression" />
+      <node concept="3Tm1VV" id="6GiZkUzfnDg" role="1B3o_S" />
+      <node concept="3Tqbb2" id="6GiZkUzfnJ0" role="3clF45">
+        <ref role="ehGHo" to="hm2y:6sdnDbSla17" resolve="Expression" />
+      </node>
+      <node concept="3clFbS" id="6GiZkUzfnDi" role="3clF47">
+        <node concept="3clFbF" id="6GiZkUzfnJO" role="3cqZAp">
+          <node concept="2OqwBi" id="6GiZkUzfoIf" role="3clFbG">
+            <node concept="1PxgMI" id="6GiZkUzfor4" role="2Oq$k0">
+              <node concept="chp4Y" id="6GiZkUzfos0" role="3oSUPX">
+                <ref role="cht4Q" to="hm2y:7NJy08a3O99" resolve="DotExpression" />
+              </node>
+              <node concept="2OqwBi" id="6GiZkUzfnOJ" role="1m5AlR">
+                <node concept="13iPFW" id="6GiZkUzfnJN" role="2Oq$k0" />
+                <node concept="1mfA1w" id="6GiZkUzfnVi" role="2OqNvi" />
+              </node>
+            </node>
+            <node concept="3TrEf2" id="6GiZkUzfpIH" role="2OqNvi">
+              <ref role="3Tt5mk" to="hm2y:4rZeNQ6NgXF" resolve="expr" />
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="13i0hz" id="6GiZkUzfqE6" role="13h7CS">
+      <property role="TrG5h" value="type" />
+      <node concept="3Tm1VV" id="6GiZkUzfqE7" role="1B3o_S" />
+      <node concept="3Tqbb2" id="6GiZkUzfqRk" role="3clF45">
+        <ref role="ehGHo" to="hm2y:5r47dOfJ9kS" resolve="NamedTupleType" />
+      </node>
+      <node concept="3clFbS" id="6GiZkUzfqE9" role="3clF47">
+        <node concept="3clFbF" id="6GiZkUzfr29" role="3cqZAp">
+          <node concept="1PxgMI" id="6GiZkUzfsfl" role="3clFbG">
+            <property role="1BlNFB" value="true" />
+            <node concept="chp4Y" id="6GiZkUzfsgz" role="3oSUPX">
+              <ref role="cht4Q" to="hm2y:5r47dOfJ9kS" resolve="NamedTupleType" />
+            </node>
+            <node concept="2OqwBi" id="6GiZkUzfrek" role="1m5AlR">
+              <node concept="BsUDl" id="6GiZkUzfr28" role="2Oq$k0">
+                <ref role="37wK5l" node="6GiZkUzfnDf" resolve="expression" />
+              </node>
+              <node concept="3JvlWi" id="6GiZkUzfrHO" role="2OqNvi" />
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="13i0hz" id="6GiZkUzfnf3" role="13h7CS">
+      <property role="TrG5h" value="effectDescriptor" />
+      <ref role="13i0hy" node="6GySMNjjWfO" resolve="effectDescriptor" />
+      <node concept="3Tm1VV" id="6GiZkUzfnf4" role="1B3o_S" />
+      <node concept="3clFbS" id="6GiZkUzfnfd" role="3clF47">
+        <node concept="3clFbF" id="6GiZkUzfnq7" role="3cqZAp">
+          <node concept="BsUDl" id="6GiZkUzfnq2" role="3clFbG">
+            <ref role="37wK5l" node="6KxoTHgL$U0" resolve="deriveFrom" />
+            <node concept="2OqwBi" id="6GiZkUzfsw8" role="37wK5m">
+              <node concept="BsUDl" id="6GiZkUzfslc" role="2Oq$k0">
+                <ref role="37wK5l" node="6GiZkUzfqE6" resolve="type" />
+              </node>
+              <node concept="3TrEf2" id="6GiZkUzfsPU" role="2OqNvi">
+                <ref role="3Tt5mk" to="hm2y:5r47dOfJ9kT" resolve="decl" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3uibUv" id="6GiZkUzfnfe" role="3clF45">
+        <ref role="3uigEE" to="oq0c:3ni3WieuV7z" resolve="EffectDescriptor" />
+      </node>
+    </node>
+  </node>
 </model>
 
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/constraints.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/constraints.mps
index dc275d54e1..00e00d040c 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/constraints.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/constraints.mps
@@ -1098,5 +1098,36 @@
       </node>
     </node>
   </node>
+  <node concept="1M2fIO" id="6GiZkUz7$Pr">
+    <property role="3GE5qa" value="tuples" />
+    <ref role="1M2myG" to="hm2y:6GiZkUz7qWO" resolve="InlinedNamedTupleAccess" />
+    <node concept="9S07l" id="6GiZkUz7$Ps" role="9Vyp8">
+      <node concept="3clFbS" id="6GiZkUz7$Pt" role="2VODD2">
+        <node concept="3clFbF" id="6GiZkUz7$X6" role="3cqZAp">
+          <node concept="2OqwBi" id="7cphKbLweDA" role="3clFbG">
+            <node concept="2OqwBi" id="7cphKbLwdZw" role="2Oq$k0">
+              <node concept="2OqwBi" id="7cphKbLwdf4" role="2Oq$k0">
+                <node concept="1PxgMI" id="7cphKbLwcPC" role="2Oq$k0">
+                  <node concept="chp4Y" id="7cphKbLwcXc" role="3oSUPX">
+                    <ref role="cht4Q" to="hm2y:7NJy08a3O99" resolve="DotExpression" />
+                  </node>
+                  <node concept="nLn13" id="7cphKbLwcfl" role="1m5AlR" />
+                </node>
+                <node concept="3TrEf2" id="7cphKbLwd$z" role="2OqNvi">
+                  <ref role="3Tt5mk" to="hm2y:4rZeNQ6NgXF" resolve="expr" />
+                </node>
+              </node>
+              <node concept="3JvlWi" id="7cphKbLwek1" role="2OqNvi" />
+            </node>
+            <node concept="1mIQ4w" id="7cphKbLweYP" role="2OqNvi">
+              <node concept="chp4Y" id="7cphKbLwffF" role="cj9EA">
+                <ref role="cht4Q" to="hm2y:5r47dOfJ9kS" resolve="NamedTupleType" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+  </node>
 </model>
 
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/editor.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/editor.mps
index 69dc0c7e4b..e5e4663bd4 100755
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/editor.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/editor.mps
@@ -41,6 +41,7 @@
     <import index="lzb2" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.ui(MPS.IDEA/)" />
     <import index="gdgh" ref="r:e4d9478b-ae0e-416e-be60-73d136571015(org.iets3.core.base.behavior)" implicit="true" />
     <import index="vs0r" ref="r:f7764ca4-8c75-4049-922b-08516400a727(com.mbeddr.core.base.structure)" implicit="true" />
+    <import index="tpcu" ref="r:00000000-0000-4000-0000-011c89590282(jetbrains.mps.lang.core.behavior)" implicit="true" />
   </imports>
   <registry>
     <language id="b8bb702e-43ed-4090-a902-d180d3e5f292" name="de.slisson.mps.conditionalEditor">
@@ -99,10 +100,16 @@
       <concept id="1142886221719" name="jetbrains.mps.lang.editor.structure.QueryFunction_NodeCondition" flags="in" index="pkWqt" />
       <concept id="1142886811589" name="jetbrains.mps.lang.editor.structure.ConceptFunctionParameter_node" flags="nn" index="pncrf" />
       <concept id="1237385578942" name="jetbrains.mps.lang.editor.structure.IndentLayoutOnNewLineStyleClassItem" flags="ln" index="pVoyu" />
+      <concept id="1177327570013" name="jetbrains.mps.lang.editor.structure.QueryFunction_SubstituteMenu_Substitute" flags="in" index="ucgPf" />
+      <concept id="8478191136883534237" name="jetbrains.mps.lang.editor.structure.IExtensibleSubstituteMenuPart" flags="ng" index="upBLQ">
+        <child id="8478191136883534238" name="features" index="upBLP" />
+      </concept>
+      <concept id="1177335944525" name="jetbrains.mps.lang.editor.structure.QueryFunction_SubstituteMenu_SubstituteString" flags="in" index="uGdhv" />
       <concept id="1080736578640" name="jetbrains.mps.lang.editor.structure.BaseEditorComponent" flags="ig" index="2wURMF">
         <child id="1080736633877" name="cellModel" index="2wV5jI" />
       </concept>
       <concept id="795210086017940429" name="jetbrains.mps.lang.editor.structure.ReadOnlyStyleClassItem" flags="lg" index="xShMh" />
+      <concept id="8371900013785948369" name="jetbrains.mps.lang.editor.structure.QueryFunction_SubstituteMenu_Parameter" flags="ig" index="2$S_p_" />
       <concept id="6718020819487620876" name="jetbrains.mps.lang.editor.structure.TransformationMenuReference_Default" flags="ng" index="A1WHr" />
       <concept id="5944657839000868711" name="jetbrains.mps.lang.editor.structure.ConceptEditorContextHints" flags="ig" index="2ABfQD">
         <child id="5944657839000877563" name="hints" index="2ABdcP" />
@@ -116,6 +123,10 @@
         <property id="3473224453637651917" name="placeInCell" index="CtIbK" />
       </concept>
       <concept id="1239814640496" name="jetbrains.mps.lang.editor.structure.CellLayout_VerticalGrid" flags="nn" index="2EHx9g" />
+      <concept id="308059530142752797" name="jetbrains.mps.lang.editor.structure.SubstituteMenuPart_Parameterized" flags="ng" index="2F$Pav">
+        <child id="8371900013785948359" name="part" index="2$S_pN" />
+        <child id="8371900013785948365" name="parameterQuery" index="2$S_pT" />
+      </concept>
       <concept id="1638911550608610798" name="jetbrains.mps.lang.editor.structure.QueryFunction_TransformationMenu_Execute" flags="ig" index="IWg2L" />
       <concept id="1638911550608610278" name="jetbrains.mps.lang.editor.structure.TransformationMenuPart_Action" flags="ng" index="IWgqT">
         <child id="6202297022026447496" name="canExecuteFunction" index="2jiSrf" />
@@ -184,12 +195,19 @@
         <child id="3383245079137422296" name="dominates" index="14Sbyx" />
       </concept>
       <concept id="8313721352726366579" name="jetbrains.mps.lang.editor.structure.CellModel_Empty" flags="ng" index="35HoNQ" />
+      <concept id="8998492695583125082" name="jetbrains.mps.lang.editor.structure.SubstituteFeature_MatchingText" flags="ng" index="16NfWO">
+        <child id="8998492695583129244" name="query" index="16NeZM" />
+      </concept>
+      <concept id="8998492695583129971" name="jetbrains.mps.lang.editor.structure.SubstituteFeature_DescriptionText" flags="ng" index="16NL0t">
+        <child id="8998492695583129972" name="query" index="16NL0q" />
+      </concept>
       <concept id="1235999440492" name="jetbrains.mps.lang.editor.structure.HorizontalAlign" flags="ln" index="37jFXN">
         <property id="1235999920262" name="align" index="37lx6p" />
       </concept>
       <concept id="1220974635399" name="jetbrains.mps.lang.editor.structure.QueryFunction_FontStyle" flags="in" index="17KAyr" />
       <concept id="2115302367868116903" name="jetbrains.mps.lang.editor.structure.GeneratedSubstituteMenuAttribute" flags="ng" index="382kZG" />
       <concept id="3360401466585705291" name="jetbrains.mps.lang.editor.structure.CellModel_ContextAssistant" flags="ng" index="18a60v" />
+      <concept id="1154465273778" name="jetbrains.mps.lang.editor.structure.QueryFunctionParameter_SubstituteMenu_ParentNode" flags="nn" index="3bvxqY" />
       <concept id="1838685759388685703" name="jetbrains.mps.lang.editor.structure.TransformationFeature_DescriptionText" flags="ng" index="3cqGtN">
         <child id="1838685759388685704" name="query" index="3cqGtW" />
       </concept>
@@ -197,6 +215,9 @@
       <concept id="2896773699153795590" name="jetbrains.mps.lang.editor.structure.TransformationLocation_SideTransform" flags="ng" index="3cWJ9i">
         <child id="3473224453637651919" name="placeInCell" index="CtIbM" />
       </concept>
+      <concept id="7342352913006985483" name="jetbrains.mps.lang.editor.structure.SubstituteMenuPart_Action" flags="ng" index="3eGOop">
+        <child id="8612453216082699922" name="substituteHandler" index="3aKz83" />
+      </concept>
       <concept id="1139535219966" name="jetbrains.mps.lang.editor.structure.CellActionMapDeclaration" flags="ig" index="1h_SRR">
         <reference id="1139535219968" name="applicableConcept" index="1h_SK9" />
         <child id="1139535219969" name="item" index="1h_SK8" />
@@ -538,6 +559,22 @@
         <child id="2490242408670937967" name="factoryMethod" index="3ZZHOD" />
       </concept>
     </language>
+    <language id="3a13115c-633c-4c5c-bbcc-75c4219e9555" name="jetbrains.mps.lang.quotation">
+      <concept id="5455284157994012186" name="jetbrains.mps.lang.quotation.structure.NodeBuilderInitLink" flags="ng" index="2pIpSj">
+        <reference id="5455284157994012188" name="link" index="2pIpSl" />
+        <child id="1595412875168045827" name="initValue" index="28nt2d" />
+      </concept>
+      <concept id="5455284157993863837" name="jetbrains.mps.lang.quotation.structure.NodeBuilder" flags="nn" index="2pJPEk">
+        <child id="5455284157993863838" name="quotedNode" index="2pJPEn" />
+      </concept>
+      <concept id="5455284157993863840" name="jetbrains.mps.lang.quotation.structure.NodeBuilderNode" flags="nn" index="2pJPED">
+        <reference id="5455284157993910961" name="concept" index="2pJxaS" />
+        <child id="5455284157993911099" name="values" index="2pJxcM" />
+      </concept>
+      <concept id="8182547171709752110" name="jetbrains.mps.lang.quotation.structure.NodeBuilderExpression" flags="nn" index="36biLy">
+        <child id="8182547171709752112" name="expression" index="36biLW" />
+      </concept>
+    </language>
     <language id="1919c723-b60b-4592-9318-9ce96d91da44" name="de.itemis.mps.editor.celllayout">
       <concept id="4682418030828844315" name="de.itemis.mps.editor.celllayout.structure.HorizontalLineColorStyle" flags="lg" index="2T_bXS" />
       <concept id="4682418030828844314" name="de.itemis.mps.editor.celllayout.structure.HorzontalLineWidthStyle" flags="lg" index="2T_bXT" />
@@ -651,6 +688,9 @@
       <concept id="540871147943773365" name="jetbrains.mps.baseLanguage.collections.structure.SingleArgumentSequenceOperation" flags="nn" index="25WWJ4">
         <child id="540871147943773366" name="argument" index="25WWJ7" />
       </concept>
+      <concept id="1224414427926" name="jetbrains.mps.baseLanguage.collections.structure.SequenceCreator" flags="nn" index="kMnCb">
+        <child id="1224414456414" name="elementType" index="kMuH3" />
+      </concept>
       <concept id="1151688443754" name="jetbrains.mps.baseLanguage.collections.structure.ListType" flags="in" index="_YKpA">
         <child id="1151688676805" name="elementType" index="_ZDj9" />
       </concept>
@@ -7173,5 +7213,157 @@
     <node concept="2tJIrI" id="jqB9UdvFT2" role="jymVt" />
     <node concept="3Tm1VV" id="jqB9UdvFoA" role="1B3o_S" />
   </node>
+  <node concept="22mcaB" id="6GiZkUz7qWL">
+    <property role="3GE5qa" value="tuples" />
+    <ref role="aqKnT" to="hm2y:5r47dOfJ9kS" resolve="NamedTupleType" />
+    <node concept="22hDWj" id="6GiZkUz7qWM" role="22hAXT" />
+  </node>
+  <node concept="22mcaB" id="6GiZkUz7t5K">
+    <property role="3GE5qa" value="tuples" />
+    <ref role="aqKnT" to="hm2y:6GiZkUz7qWO" resolve="InlinedNamedTupleAccess" />
+    <node concept="2F$Pav" id="2Q7faZZqpyr" role="3ft7WO">
+      <node concept="3eGOop" id="2Q7faZZrL1w" role="2$S_pN">
+        <node concept="ucgPf" id="2Q7faZZrL1y" role="3aKz83">
+          <node concept="3clFbS" id="2Q7faZZrL1$" role="2VODD2">
+            <node concept="3clFbF" id="2Q7faZZrLgx" role="3cqZAp">
+              <node concept="2pJPEk" id="2Q7faZZrLgv" role="3clFbG">
+                <node concept="2pJPED" id="2Q7faZZrLmR" role="2pJPEn">
+                  <ref role="2pJxaS" to="hm2y:6GiZkUz7qWO" resolve="InlinedNamedTupleAccess" />
+                  <node concept="2pIpSj" id="6GiZkUz7zPx" role="2pJxcM">
+                    <ref role="2pIpSl" to="hm2y:6GiZkUz7r1V" resolve="member" />
+                    <node concept="36biLy" id="6GiZkUz7zSt" role="28nt2d">
+                      <node concept="2ZBlsa" id="6GiZkUz7zXF" role="36biLW" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="16NfWO" id="2Q7faZZzsmM" role="upBLP">
+          <node concept="uGdhv" id="2Q7faZZzsoy" role="16NeZM">
+            <node concept="3clFbS" id="2Q7faZZzso$" role="2VODD2">
+              <node concept="3clFbF" id="2Q7faZZzsp0" role="3cqZAp">
+                <node concept="2OqwBi" id="2Q7faZZzsG1" role="3clFbG">
+                  <node concept="2ZBlsa" id="2Q7faZZzsoZ" role="2Oq$k0" />
+                  <node concept="3TrcHB" id="2Q7faZZzteX" role="2OqNvi">
+                    <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="16NL0t" id="2Q7faZZwpfx" role="upBLP">
+          <node concept="uGdhv" id="2Q7faZZwpkc" role="16NL0q">
+            <node concept="3clFbS" id="2Q7faZZwpke" role="2VODD2">
+              <node concept="3clFbF" id="2Q7faZZwpYD" role="3cqZAp">
+                <node concept="3cpWs3" id="2Q7faZZztyH" role="3clFbG">
+                  <node concept="Xl_RD" id="2Q7faZZwpYC" role="3uHU7w">
+                    <property role="Xl_RC" value=" inline tuple member" />
+                  </node>
+                  <node concept="2OqwBi" id="1br4Vy9oJ8" role="3uHU7B">
+                    <node concept="2OqwBi" id="1br4Vy9oJ9" role="2Oq$k0">
+                      <node concept="2ZBlsa" id="1br4Vy9oJa" role="2Oq$k0" />
+                      <node concept="2qgKlT" id="1br4Vy9oJb" role="2OqNvi">
+                        <ref role="37wK5l" to="pbu6:5r47dOg5pCn" resolve="type" />
+                      </node>
+                    </node>
+                    <node concept="2qgKlT" id="1br4Vy9oJc" role="2OqNvi">
+                      <ref role="37wK5l" to="tpcu:hEwIMiw" resolve="getPresentation" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3Tqbb2" id="2Q7faZZwx_7" role="2ZBHrp">
+        <ref role="ehGHo" to="hm2y:5r47dOfJ8UC" resolve="ITupleMemberDeclaration" />
+      </node>
+      <node concept="2$S_p_" id="2Q7faZZqvd6" role="2$S_pT">
+        <node concept="3clFbS" id="2Q7faZZqvd7" role="2VODD2">
+          <node concept="3cpWs8" id="7cphKbLwqZq" role="3cqZAp">
+            <node concept="3cpWsn" id="7cphKbLwqZr" role="3cpWs9">
+              <property role="TrG5h" value="baseType" />
+              <node concept="3Tqbb2" id="7cphKbLwqZl" role="1tU5fm" />
+              <node concept="2OqwBi" id="7cphKbLwqZs" role="33vP2m">
+                <node concept="2OqwBi" id="7cphKbLwqZt" role="2Oq$k0">
+                  <node concept="1PxgMI" id="7cphKbLwqZu" role="2Oq$k0">
+                    <node concept="chp4Y" id="7cphKbLwqZv" role="3oSUPX">
+                      <ref role="cht4Q" to="hm2y:7NJy08a3O99" resolve="DotExpression" />
+                    </node>
+                    <node concept="3bvxqY" id="2Q7faZZqwBa" role="1m5AlR" />
+                  </node>
+                  <node concept="3TrEf2" id="7cphKbLwqZz" role="2OqNvi">
+                    <ref role="3Tt5mk" to="hm2y:4rZeNQ6NgXF" resolve="expr" />
+                  </node>
+                </node>
+                <node concept="3JvlWi" id="7cphKbLwqZ$" role="2OqNvi" />
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbJ" id="7cphKbLwfOg" role="3cqZAp">
+            <node concept="2OqwBi" id="7cphKbLwhti" role="3clFbw">
+              <node concept="37vLTw" id="7cphKbLwqZ_" role="2Oq$k0">
+                <ref role="3cqZAo" node="7cphKbLwqZr" resolve="baseType" />
+              </node>
+              <node concept="1mIQ4w" id="7cphKbLwhTP" role="2OqNvi">
+                <node concept="chp4Y" id="7cphKbLwq6U" role="cj9EA">
+                  <ref role="cht4Q" to="hm2y:5r47dOfJ9kS" resolve="NamedTupleType" />
+                </node>
+              </node>
+            </node>
+            <node concept="3clFbS" id="7cphKbLwfOi" role="3clFbx">
+              <node concept="3cpWs6" id="7cphKbLwqxP" role="3cqZAp">
+                <node concept="2OqwBi" id="6GiZkUz7w5x" role="3cqZAk">
+                  <node concept="2OqwBi" id="7cphKbLwxky" role="2Oq$k0">
+                    <node concept="1PxgMI" id="7cphKbLwuTO" role="2Oq$k0">
+                      <node concept="chp4Y" id="7cphKbLwvuN" role="3oSUPX">
+                        <ref role="cht4Q" to="hm2y:5r47dOfJ9kS" resolve="NamedTupleType" />
+                      </node>
+                      <node concept="37vLTw" id="7cphKbLwrOI" role="1m5AlR">
+                        <ref role="3cqZAo" node="7cphKbLwqZr" resolve="baseType" />
+                      </node>
+                    </node>
+                    <node concept="3TrEf2" id="6GiZkUz7vrD" role="2OqNvi">
+                      <ref role="3Tt5mk" to="hm2y:5r47dOfJ9kT" resolve="decl" />
+                    </node>
+                  </node>
+                  <node concept="2qgKlT" id="6GiZkUz7woI" role="2OqNvi">
+                    <ref role="37wK5l" to="pbu6:5r47dOfJ8UL" resolve="getMembers" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbF" id="7cphKbLwkTG" role="3cqZAp">
+            <node concept="2ShNRf" id="7cphKbLwkTw" role="3clFbG">
+              <node concept="kMnCb" id="2Q7faZZx2qZ" role="2ShVmc">
+                <node concept="3Tqbb2" id="2Q7faZZx66x" role="kMuH3">
+                  <ref role="ehGHo" to="hm2y:5r47dOfJ8UC" resolve="ITupleMemberDeclaration" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="22hDWj" id="6GiZkUz7t5L" role="22hAXT" />
+  </node>
+  <node concept="24kQdi" id="6GiZkUzcMTp">
+    <property role="3GE5qa" value="tuples" />
+    <ref role="1XX52x" to="hm2y:6GiZkUz7qWO" resolve="InlinedNamedTupleAccess" />
+    <node concept="1iCGBv" id="6GiZkUzcMTr" role="2wV5jI">
+      <ref role="1NtTu8" to="hm2y:6GiZkUz7r1V" resolve="member" />
+      <node concept="1sVBvm" id="6GiZkUzcMTt" role="1sWHZn">
+        <node concept="3F0A7n" id="6GiZkUzcMTB" role="2wV5jI">
+          <property role="1Intyy" value="true" />
+          <ref role="1NtTu8" to="tpck:h0TrG11" resolve="name" />
+        </node>
+      </node>
+    </node>
+  </node>
 </model>
 
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/structure.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/structure.mps
index d9ec023b64..56da1ef647 100755
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/structure.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/structure.mps
@@ -2202,6 +2202,9 @@
     <property role="TrG5h" value="ITupleMemberDeclaration" />
     <property role="3GE5qa" value="tuples" />
     <property role="EcuMT" value="6252153918474456743" />
+    <node concept="PrWs8" id="6GiZkUz7zfY" role="PrDN$">
+      <ref role="PrY4T" to="tpck:h0TrEE$" resolve="INamedConcept" />
+    </node>
   </node>
   <node concept="1TIwiD" id="5r47dOfJ9kS">
     <property role="EcuMT" value="6252153918474458424" />
@@ -2215,5 +2218,23 @@
       <ref role="20lvS9" node="5r47dOfJ8Ur" resolve="ITupleDeclaration" />
     </node>
   </node>
+  <node concept="1TIwiD" id="6GiZkUz7qWO">
+    <property role="EcuMT" value="7715507625824988980" />
+    <property role="3GE5qa" value="tuples" />
+    <property role="TrG5h" value="InlinedNamedTupleAccess" />
+    <ref role="1TJDcQ" to="tpck:gw2VY9q" />
+    <node concept="1TJgyj" id="6GiZkUz7r1V" role="1TKVEi">
+      <property role="IQ2ns" value="7715507625824989307" />
+      <property role="20kJfa" value="member" />
+      <property role="20lbJX" value="fLJekj4/_1" />
+      <ref role="20lvS9" node="5r47dOfJ8UC" resolve="ITupleMemberDeclaration" />
+    </node>
+    <node concept="PrWs8" id="6GiZkUz7qWQ" role="PzmwI">
+      <ref role="PrY4T" node="7NJy08a3O9a" resolve="IDotTarget" />
+    </node>
+    <node concept="PrWs8" id="6GiZkUz7qWS" role="PzmwI">
+      <ref role="PrY4T" node="6KxoTHgLv_I" resolve="IMayHaveEffect" />
+    </node>
+  </node>
 </model>
 
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/typesystem.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/typesystem.mps
index 7c1ebd0210..fc27c6cebd 100755
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/typesystem.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/typesystem.mps
@@ -96,6 +96,7 @@
       <concept id="1068498886292" name="jetbrains.mps.baseLanguage.structure.ParameterDeclaration" flags="ir" index="37vLTG" />
       <concept id="1068498886294" name="jetbrains.mps.baseLanguage.structure.AssignmentExpression" flags="nn" index="37vLTI" />
       <concept id="1225271177708" name="jetbrains.mps.baseLanguage.structure.StringType" flags="in" index="17QB3L" />
+      <concept id="1225271283259" name="jetbrains.mps.baseLanguage.structure.NPEEqualsExpression" flags="nn" index="17R0WA" />
       <concept id="4972933694980447171" name="jetbrains.mps.baseLanguage.structure.BaseVariableDeclaration" flags="ng" index="19Szcq">
         <child id="5680397130376446158" name="type" index="1tU5fm" />
       </concept>
@@ -488,6 +489,7 @@
         <child id="1225711182005" name="list" index="1y566C" />
         <child id="1225711191269" name="index" index="1y58nS" />
       </concept>
+      <concept id="1225727723840" name="jetbrains.mps.baseLanguage.collections.structure.FindFirstOperation" flags="nn" index="1z4cxt" />
       <concept id="1202120902084" name="jetbrains.mps.baseLanguage.collections.structure.WhereOperation" flags="nn" index="3zZkjj" />
       <concept id="1202128969694" name="jetbrains.mps.baseLanguage.collections.structure.SelectOperation" flags="nn" index="3$u5V9" />
       <concept id="1172254888721" name="jetbrains.mps.baseLanguage.collections.structure.ContainsOperation" flags="nn" index="3JPx81" />
@@ -10925,5 +10927,140 @@
       <ref role="1YaFvo" to="hm2y:5r47dOfJ9kS" resolve="NamedTupleType" />
     </node>
   </node>
+  <node concept="1YbPZF" id="6GiZkUz7CB1">
+    <property role="TrG5h" value="typeof_InlinedNamedTupleAccessExpr" />
+    <property role="3GE5qa" value="tuples" />
+    <node concept="3clFbS" id="6GiZkUz7CB2" role="18ibNy">
+      <node concept="nvevp" id="7cphKbLtLSz" role="3cqZAp">
+        <node concept="3clFbS" id="7cphKbLtLS$" role="nvhr_">
+          <node concept="3clFbJ" id="7cphKbLtMq2" role="3cqZAp">
+            <node concept="2OqwBi" id="7cphKbLtMxZ" role="3clFbw">
+              <node concept="2X3wrD" id="7cphKbLtMqe" role="2Oq$k0">
+                <ref role="2X3Bk0" node="7cphKbLtLSA" resolve="ctxType" />
+              </node>
+              <node concept="1mIQ4w" id="7cphKbLtMF9" role="2OqNvi">
+                <node concept="chp4Y" id="7cphKbLtMGW" role="cj9EA">
+                  <ref role="cht4Q" to="hm2y:5r47dOfJ9kS" resolve="NamedTupleType" />
+                </node>
+              </node>
+            </node>
+            <node concept="3clFbS" id="7cphKbLtMq4" role="3clFbx">
+              <node concept="3cpWs8" id="7cphKbLtN7o" role="3cqZAp">
+                <node concept="3cpWsn" id="7cphKbLtN7p" role="3cpWs9">
+                  <property role="TrG5h" value="tt" />
+                  <node concept="3Tqbb2" id="7cphKbLtN7g" role="1tU5fm">
+                    <ref role="ehGHo" to="hm2y:5r47dOfJ9kS" resolve="NamedTupleType" />
+                  </node>
+                  <node concept="1PxgMI" id="7cphKbLtN7q" role="33vP2m">
+                    <node concept="chp4Y" id="7cphKbLtN7r" role="3oSUPX">
+                      <ref role="cht4Q" to="hm2y:5r47dOfJ9kS" resolve="NamedTupleType" />
+                    </node>
+                    <node concept="2X3wrD" id="7cphKbLtN7s" role="1m5AlR">
+                      <ref role="2X3Bk0" node="7cphKbLtLSA" resolve="ctxType" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="3cpWs8" id="7cphKbLtYG$" role="3cqZAp">
+                <node concept="3cpWsn" id="7cphKbLtYG_" role="3cpWs9">
+                  <property role="TrG5h" value="tmd" />
+                  <node concept="3Tqbb2" id="7cphKbLtYGa" role="1tU5fm">
+                    <ref role="ehGHo" to="hm2y:5r47dOfJ8UC" resolve="ITupleMemberDeclaration" />
+                  </node>
+                  <node concept="2OqwBi" id="6GiZkUz7I5d" role="33vP2m">
+                    <node concept="2OqwBi" id="6GiZkUz7G0r" role="2Oq$k0">
+                      <node concept="2OqwBi" id="1Ic1PAvQVR" role="2Oq$k0">
+                        <node concept="37vLTw" id="1Ic1PAvQE8" role="2Oq$k0">
+                          <ref role="3cqZAo" node="7cphKbLtN7p" resolve="tt" />
+                        </node>
+                        <node concept="3TrEf2" id="6GiZkUz7FNp" role="2OqNvi">
+                          <ref role="3Tt5mk" to="hm2y:5r47dOfJ9kT" resolve="decl" />
+                        </node>
+                      </node>
+                      <node concept="2qgKlT" id="6GiZkUz7GoU" role="2OqNvi">
+                        <ref role="37wK5l" to="pbu6:5r47dOfJ8UL" resolve="getMembers" />
+                      </node>
+                    </node>
+                    <node concept="1z4cxt" id="6GiZkUz7LyJ" role="2OqNvi">
+                      <node concept="1bVj0M" id="6GiZkUz7LyL" role="23t8la">
+                        <node concept="3clFbS" id="6GiZkUz7LyM" role="1bW5cS">
+                          <node concept="3clFbF" id="6GiZkUz7LEl" role="3cqZAp">
+                            <node concept="17R0WA" id="6GiZkUz7NAJ" role="3clFbG">
+                              <node concept="37vLTw" id="6GiZkUz7N62" role="3uHU7B">
+                                <ref role="3cqZAo" node="6GiZkUz7LyN" resolve="it" />
+                              </node>
+                              <node concept="2OqwBi" id="6GiZkUz7Mrj" role="3uHU7w">
+                                <node concept="1YBJjd" id="6GiZkUz7MbJ" role="2Oq$k0">
+                                  <ref role="1YBMHb" node="6GiZkUz7CB4" resolve="inta" />
+                                </node>
+                                <node concept="3TrEf2" id="6GiZkUz7MVa" role="2OqNvi">
+                                  <ref role="3Tt5mk" to="hm2y:6GiZkUz7r1V" resolve="member" />
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                        <node concept="Rh6nW" id="6GiZkUz7LyN" role="1bW2Oz">
+                          <property role="TrG5h" value="it" />
+                          <node concept="2jxLKc" id="6GiZkUz7LyO" role="1tU5fm" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="3clFbJ" id="7cphKbLtZjJ" role="3cqZAp">
+                <node concept="3clFbS" id="7cphKbLtZjL" role="3clFbx">
+                  <node concept="1Z5TYs" id="7cphKbLtZWe" role="3cqZAp">
+                    <node concept="mw_s8" id="7cphKbLu06s" role="1ZfhKB">
+                      <node concept="2OqwBi" id="7cphKbLu0iG" role="mwGJk">
+                        <node concept="37vLTw" id="7cphKbLu06q" role="2Oq$k0">
+                          <ref role="3cqZAo" node="7cphKbLtYG_" resolve="m" />
+                        </node>
+                        <node concept="2qgKlT" id="6GiZkUz7QHj" role="2OqNvi">
+                          <ref role="37wK5l" to="pbu6:5r47dOg5pCn" resolve="type" />
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="mw_s8" id="7cphKbLtZWh" role="1ZfhK$">
+                      <node concept="1Z2H0r" id="7cphKbLtZEu" role="mwGJk">
+                        <node concept="1YBJjd" id="7cphKbLtZEK" role="1Z2MuG">
+                          <ref role="1YBMHb" node="6GiZkUz7CB4" resolve="irma" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="3y3z36" id="7cphKbLtZ_R" role="3clFbw">
+                  <node concept="10Nm6u" id="7cphKbLtZEe" role="3uHU7w" />
+                  <node concept="37vLTw" id="7cphKbLtZov" role="3uHU7B">
+                    <ref role="3cqZAo" node="7cphKbLtYG_" resolve="m" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="1Z2H0r" id="7cphKbLtLTl" role="nvjzm">
+          <node concept="2OqwBi" id="7cphKbLtM3l" role="1Z2MuG">
+            <node concept="1YBJjd" id="7cphKbLtLTL" role="2Oq$k0">
+              <ref role="1YBMHb" node="6GiZkUz7CB4" resolve="irma" />
+            </node>
+            <node concept="2qgKlT" id="7cphKbLtMkq" role="2OqNvi">
+              <ref role="37wK5l" to="pbu6:6zmBjqUivyF" resolve="contextExpression" />
+            </node>
+          </node>
+        </node>
+        <node concept="2X1qdy" id="7cphKbLtLSA" role="2X0Ygz">
+          <property role="TrG5h" value="ctxType" />
+          <node concept="2jxLKc" id="7cphKbLtLSB" role="1tU5fm" />
+        </node>
+      </node>
+    </node>
+    <node concept="1YaCAy" id="6GiZkUz7CB4" role="1YuTPh">
+      <property role="TrG5h" value="inta" />
+      <ref role="1YaFvo" to="hm2y:6GiZkUz7qWO" resolve="InlinedNamedTupleAccess" />
+    </node>
+  </node>
 </model>
 

From ee052428889bedebb33d85e63396d9a7deee15e5 Mon Sep 17 00:00:00 2001
From: Alexander Rimer <rimer@itemis.de>
Date: Wed, 31 Jan 2024 18:18:15 +0100
Subject: [PATCH 04/14] expr.base: renaming

---
 .../models/behavior.mps                       | 32 +++++++++----
 .../models/constraints.mps                    |  2 +-
 .../models/editor.mps                         | 48 +++++++++++++++++--
 .../models/structure.mps                      |  2 +-
 .../models/typesystem.mps                     | 10 ++--
 5 files changed, 75 insertions(+), 19 deletions(-)

diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/behavior.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/behavior.mps
index 69fab1cba9..d9fcff7711 100755
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/behavior.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/behavior.mps
@@ -27463,14 +27463,14 @@
       <property role="TrG5h" value="type" />
       <node concept="3Tm1VV" id="6GiZkUzfqE7" role="1B3o_S" />
       <node concept="3Tqbb2" id="6GiZkUzfqRk" role="3clF45">
-        <ref role="ehGHo" to="hm2y:5r47dOfJ9kS" resolve="NamedTupleType" />
+        <ref role="ehGHo" to="hm2y:5r47dOfJ9kS" resolve="InlineTupleType" />
       </node>
       <node concept="3clFbS" id="6GiZkUzfqE9" role="3clF47">
         <node concept="3clFbF" id="6GiZkUzfr29" role="3cqZAp">
           <node concept="1PxgMI" id="6GiZkUzfsfl" role="3clFbG">
             <property role="1BlNFB" value="true" />
             <node concept="chp4Y" id="6GiZkUzfsgz" role="3oSUPX">
-              <ref role="cht4Q" to="hm2y:5r47dOfJ9kS" resolve="NamedTupleType" />
+              <ref role="cht4Q" to="hm2y:5r47dOfJ9kS" resolve="InlineTupleType" />
             </node>
             <node concept="2OqwBi" id="6GiZkUzfrek" role="1m5AlR">
               <node concept="BsUDl" id="6GiZkUzfr28" role="2Oq$k0">
@@ -27482,6 +27482,25 @@
         </node>
       </node>
     </node>
+    <node concept="13i0hz" id="1c6hIxyZnje" role="13h7CS">
+      <property role="TrG5h" value="tupleDeclaration" />
+      <node concept="3Tm1VV" id="1c6hIxyZnjf" role="1B3o_S" />
+      <node concept="3Tqbb2" id="1c6hIxyZnyV" role="3clF45">
+        <ref role="ehGHo" to="hm2y:5r47dOfJ8Ur" resolve="ITupleDeclaration" />
+      </node>
+      <node concept="3clFbS" id="1c6hIxyZnjh" role="3clF47">
+        <node concept="3clFbF" id="1c6hIxyZn$Y" role="3cqZAp">
+          <node concept="2OqwBi" id="1c6hIxyZn_0" role="3clFbG">
+            <node concept="BsUDl" id="1c6hIxyZn_1" role="2Oq$k0">
+              <ref role="37wK5l" node="6GiZkUzfqE6" resolve="type" />
+            </node>
+            <node concept="3TrEf2" id="1c6hIxyZn_2" role="2OqNvi">
+              <ref role="3Tt5mk" to="hm2y:5r47dOfJ9kT" resolve="decl" />
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
     <node concept="13i0hz" id="6GiZkUzfnf3" role="13h7CS">
       <property role="TrG5h" value="effectDescriptor" />
       <ref role="13i0hy" node="6GySMNjjWfO" resolve="effectDescriptor" />
@@ -27490,13 +27509,8 @@
         <node concept="3clFbF" id="6GiZkUzfnq7" role="3cqZAp">
           <node concept="BsUDl" id="6GiZkUzfnq2" role="3clFbG">
             <ref role="37wK5l" node="6KxoTHgL$U0" resolve="deriveFrom" />
-            <node concept="2OqwBi" id="6GiZkUzfsw8" role="37wK5m">
-              <node concept="BsUDl" id="6GiZkUzfslc" role="2Oq$k0">
-                <ref role="37wK5l" node="6GiZkUzfqE6" resolve="type" />
-              </node>
-              <node concept="3TrEf2" id="6GiZkUzfsPU" role="2OqNvi">
-                <ref role="3Tt5mk" to="hm2y:5r47dOfJ9kT" resolve="decl" />
-              </node>
+            <node concept="BsUDl" id="1c6hIxyZnGy" role="37wK5m">
+              <ref role="37wK5l" node="1c6hIxyZnje" resolve="tupleDeclaration" />
             </node>
           </node>
         </node>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/constraints.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/constraints.mps
index 00e00d040c..8b67e422f3 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/constraints.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/constraints.mps
@@ -1121,7 +1121,7 @@
             </node>
             <node concept="1mIQ4w" id="7cphKbLweYP" role="2OqNvi">
               <node concept="chp4Y" id="7cphKbLwffF" role="cj9EA">
-                <ref role="cht4Q" to="hm2y:5r47dOfJ9kS" resolve="NamedTupleType" />
+                <ref role="cht4Q" to="hm2y:5r47dOfJ9kS" resolve="InlineTupleType" />
               </node>
             </node>
           </node>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/editor.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/editor.mps
index e5e4663bd4..72f53eb6ab 100755
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/editor.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/editor.mps
@@ -7215,7 +7215,7 @@
   </node>
   <node concept="22mcaB" id="6GiZkUz7qWL">
     <property role="3GE5qa" value="tuples" />
-    <ref role="aqKnT" to="hm2y:5r47dOfJ9kS" resolve="NamedTupleType" />
+    <ref role="aqKnT" to="hm2y:5r47dOfJ9kS" resolve="InlineTupleType" />
     <node concept="22hDWj" id="6GiZkUz7qWM" role="22hAXT" />
   </node>
   <node concept="22mcaB" id="6GiZkUz7t5K">
@@ -7311,7 +7311,7 @@
               </node>
               <node concept="1mIQ4w" id="7cphKbLwhTP" role="2OqNvi">
                 <node concept="chp4Y" id="7cphKbLwq6U" role="cj9EA">
-                  <ref role="cht4Q" to="hm2y:5r47dOfJ9kS" resolve="NamedTupleType" />
+                  <ref role="cht4Q" to="hm2y:5r47dOfJ9kS" resolve="InlineTupleType" />
                 </node>
               </node>
             </node>
@@ -7321,7 +7321,7 @@
                   <node concept="2OqwBi" id="7cphKbLwxky" role="2Oq$k0">
                     <node concept="1PxgMI" id="7cphKbLwuTO" role="2Oq$k0">
                       <node concept="chp4Y" id="7cphKbLwvuN" role="3oSUPX">
-                        <ref role="cht4Q" to="hm2y:5r47dOfJ9kS" resolve="NamedTupleType" />
+                        <ref role="cht4Q" to="hm2y:5r47dOfJ9kS" resolve="InlineTupleType" />
                       </node>
                       <node concept="37vLTw" id="7cphKbLwrOI" role="1m5AlR">
                         <ref role="3cqZAo" node="7cphKbLwqZr" resolve="baseType" />
@@ -7365,5 +7365,47 @@
       </node>
     </node>
   </node>
+  <node concept="24kQdi" id="1c6hIxyRTnQ">
+    <property role="3GE5qa" value="tuples" />
+    <ref role="1XX52x" to="hm2y:5r47dOfJ9kS" resolve="InlineTupleType" />
+    <node concept="3EZMnI" id="1c6hIxySmQ7" role="2wV5jI">
+      <node concept="l2Vlx" id="1c6hIxySmQ8" role="2iSdaV" />
+      <node concept="3F0ifn" id="1c6hIxySmQ9" role="3EZMnx">
+        <property role="3F0ifm" value="inline tuple type" />
+      </node>
+      <node concept="3F0ifn" id="1c6hIxySmQa" role="3EZMnx">
+        <property role="3F0ifm" value="decl" />
+      </node>
+      <node concept="1iCGBv" id="1c6hIxySmQb" role="3EZMnx">
+        <ref role="1NtTu8" to="hm2y:5r47dOfJ9kT" resolve="decl" />
+        <node concept="1sVBvm" id="1c6hIxySmQe" role="1sWHZn">
+          <node concept="PMmxH" id="1c6hIxySmQA" role="2wV5jI">
+            <ref role="PMmxG" to="tpco:2wZex4PafBj" resolve="alias" />
+          </node>
+        </node>
+      </node>
+      <node concept="3F0ifn" id="1c6hIxySmQh" role="3EZMnx">
+        <property role="3F0ifm" value="(" />
+        <node concept="11L4FC" id="1c6hIxySmQi" role="3F10Kt">
+          <property role="VOm3f" value="true" />
+        </node>
+        <node concept="3mYdg7" id="1c6hIxySmQj" role="3F10Kt">
+          <property role="1413C4" value="body-paren" />
+        </node>
+        <node concept="11LMrY" id="1c6hIxySmQk" role="3F10Kt">
+          <property role="VOm3f" value="true" />
+        </node>
+      </node>
+      <node concept="3F0ifn" id="1c6hIxySmQl" role="3EZMnx">
+        <property role="3F0ifm" value=")" />
+        <node concept="11L4FC" id="1c6hIxySmQm" role="3F10Kt">
+          <property role="VOm3f" value="true" />
+        </node>
+        <node concept="3mYdg7" id="1c6hIxySmQn" role="3F10Kt">
+          <property role="1413C4" value="body-paren" />
+        </node>
+      </node>
+    </node>
+  </node>
 </model>
 
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/structure.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/structure.mps
index 56da1ef647..9ab265f206 100755
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/structure.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/structure.mps
@@ -2209,7 +2209,7 @@
   <node concept="1TIwiD" id="5r47dOfJ9kS">
     <property role="EcuMT" value="6252153918474458424" />
     <property role="3GE5qa" value="tuples" />
-    <property role="TrG5h" value="NamedTupleType" />
+    <property role="TrG5h" value="InlineTupleType" />
     <ref role="1TJDcQ" node="6sdnDbSlaok" resolve="Type" />
     <node concept="1TJgyj" id="5r47dOfJ9kT" role="1TKVEi">
       <property role="IQ2ns" value="6252153918474458425" />
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/typesystem.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/typesystem.mps
index fc27c6cebd..78a1a62981 100755
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/typesystem.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/typesystem.mps
@@ -6294,7 +6294,7 @@
             </node>
             <node concept="1mIQ4w" id="6GiZkUz2vUr" role="2OqNvi">
               <node concept="chp4Y" id="6GiZkUz2vUs" role="cj9EA">
-                <ref role="cht4Q" to="hm2y:5r47dOfJ9kS" resolve="NamedTupleType" />
+                <ref role="cht4Q" to="hm2y:5r47dOfJ9kS" resolve="InlineTupleType" />
               </node>
             </node>
           </node>
@@ -10924,7 +10924,7 @@
     </node>
     <node concept="1YaCAy" id="5r47dOg5h9a" role="1YuTPh">
       <property role="TrG5h" value="tt2" />
-      <ref role="1YaFvo" to="hm2y:5r47dOfJ9kS" resolve="NamedTupleType" />
+      <ref role="1YaFvo" to="hm2y:5r47dOfJ9kS" resolve="InlineTupleType" />
     </node>
   </node>
   <node concept="1YbPZF" id="6GiZkUz7CB1">
@@ -10940,7 +10940,7 @@
               </node>
               <node concept="1mIQ4w" id="7cphKbLtMF9" role="2OqNvi">
                 <node concept="chp4Y" id="7cphKbLtMGW" role="cj9EA">
-                  <ref role="cht4Q" to="hm2y:5r47dOfJ9kS" resolve="NamedTupleType" />
+                  <ref role="cht4Q" to="hm2y:5r47dOfJ9kS" resolve="InlineTupleType" />
                 </node>
               </node>
             </node>
@@ -10949,11 +10949,11 @@
                 <node concept="3cpWsn" id="7cphKbLtN7p" role="3cpWs9">
                   <property role="TrG5h" value="tt" />
                   <node concept="3Tqbb2" id="7cphKbLtN7g" role="1tU5fm">
-                    <ref role="ehGHo" to="hm2y:5r47dOfJ9kS" resolve="NamedTupleType" />
+                    <ref role="ehGHo" to="hm2y:5r47dOfJ9kS" resolve="InlineTupleType" />
                   </node>
                   <node concept="1PxgMI" id="7cphKbLtN7q" role="33vP2m">
                     <node concept="chp4Y" id="7cphKbLtN7r" role="3oSUPX">
-                      <ref role="cht4Q" to="hm2y:5r47dOfJ9kS" resolve="NamedTupleType" />
+                      <ref role="cht4Q" to="hm2y:5r47dOfJ9kS" resolve="InlineTupleType" />
                     </node>
                     <node concept="2X3wrD" id="7cphKbLtN7s" role="1m5AlR">
                       <ref role="2X3Bk0" node="7cphKbLtLSA" resolve="ctxType" />

From 21fd0022520e7b2f187b0a2d5c331046eca4bc2c Mon Sep 17 00:00:00 2001
From: Alexander Rimer <rimer@itemis.de>
Date: Wed, 31 Jan 2024 18:18:59 +0100
Subject: [PATCH 05/14] in.expr.tests: added interpreter tests for table result
 access

---
 .../models/test.in.expr.os.dectabs@tests.mps  | 366 ++++++++++++++++--
 1 file changed, 341 insertions(+), 25 deletions(-)

diff --git a/code/languages/org.iets3.opensource/tests/test.in.expr.os/models/test.in.expr.os.dectabs@tests.mps b/code/languages/org.iets3.opensource/tests/test.in.expr.os/models/test.in.expr.os.dectabs@tests.mps
index 6375007f2a..c44f155224 100644
--- a/code/languages/org.iets3.opensource/tests/test.in.expr.os/models/test.in.expr.os.dectabs@tests.mps
+++ b/code/languages/org.iets3.opensource/tests/test.in.expr.os/models/test.in.expr.os.dectabs@tests.mps
@@ -82,6 +82,16 @@
         <child id="5115872837156802411" name="expr" index="30czhm" />
       </concept>
       <concept id="5115872837156855227" name="org.iets3.core.expr.base.structure.UnaryMinusExpression" flags="ng" index="30cIq6" />
+      <concept id="7715507625824988980" name="org.iets3.core.expr.base.structure.InlinedNamedTupleAccess" flags="ng" index="383P9U">
+        <reference id="7715507625824989307" name="member" index="383OOP" />
+      </concept>
+      <concept id="2527679671886479690" name="org.iets3.core.expr.base.structure.TupleAccessExpr" flags="ng" index="3nOhSe">
+        <property id="2527679671886575030" name="index" index="3nOAFM" />
+        <child id="2527679671886479717" name="tuple" index="3nOhSx" />
+      </concept>
+      <concept id="9002563722476995145" name="org.iets3.core.expr.base.structure.DotExpression" flags="ng" index="1QScDb">
+        <child id="9002563722476995147" name="target" index="1QScD9" />
+      </concept>
     </language>
     <language id="92d2ea16-5a42-4fdf-a676-c7604efe3504" name="de.slisson.mps.richtext">
       <concept id="2557074442922380897" name="de.slisson.mps.richtext.structure.Text" flags="ng" index="19SGf9">
@@ -106,6 +116,7 @@
         <property id="7740953487931061385" name="referenceOnlyLocalStuff" index="1XBH2A" />
         <child id="543569365052711058" name="contents" index="_iOnB" />
       </concept>
+      <concept id="5285810042889815162" name="org.iets3.core.expr.tests.structure.EmptyTestItem" flags="ng" index="3dYjL0" />
     </language>
     <language id="6b277d9a-d52d-416f-a209-1919bd737f50" name="org.iets3.core.expr.simpleTypes">
       <concept id="7971844778467001950" name="org.iets3.core.expr.simpleTypes.structure.OtherwiseLiteral" flags="ng" index="2fHqz8" />
@@ -144,6 +155,12 @@
       <concept id="7061117989422577349" name="org.iets3.core.expr.toplevel.structure.EnumLiteralRef" flags="ng" index="5mhuz">
         <reference id="7061117989422577417" name="literal" index="5mhpJ" />
       </concept>
+      <concept id="7089558164906249676" name="org.iets3.core.expr.toplevel.structure.Constant" flags="ng" index="2zPypq">
+        <child id="7089558164906249715" name="value" index="2zPyp_" />
+      </concept>
+      <concept id="543569365051789113" name="org.iets3.core.expr.toplevel.structure.ConstantRef" flags="ng" index="_emDc">
+        <reference id="543569365051789114" name="constant" index="_emDf" />
+      </concept>
       <concept id="543569365052765011" name="org.iets3.core.expr.toplevel.structure.EmptyToplevelContent" flags="ng" index="_ixoA" />
       <concept id="4790956042240570348" name="org.iets3.core.expr.toplevel.structure.FunctionCall" flags="ng" index="1af_rf" />
       <concept id="4790956042240148643" name="org.iets3.core.expr.toplevel.structure.Function" flags="ng" index="1aga60" />
@@ -1504,6 +1521,22 @@
     <node concept="_ixoA" id="6OunYCfqvkJ" role="_iOnB" />
     <node concept="1aga60" id="7vcJOhhDCpu" role="_iOnB">
       <property role="TrG5h" value="calculateFareAndDiscountWithAgeReal" />
+      <node concept="1ahQXy" id="7vcJOhhDCqI" role="1ahQWs">
+        <property role="TrG5h" value="state" />
+        <node concept="5mh7t" id="7vcJOhhDCqJ" role="3ix9CU">
+          <ref role="5mh6l" node="6OunYCfqjNA" resolve="BuLand" />
+        </node>
+      </node>
+      <node concept="1ahQXy" id="7vcJOhhDCqK" role="1ahQWs">
+        <property role="TrG5h" value="club" />
+        <node concept="2vmvy5" id="7vcJOhhDCqL" role="3ix9CU" />
+      </node>
+      <node concept="1ahQXy" id="7vcJOhhDCqM" role="1ahQWs">
+        <property role="TrG5h" value="age" />
+        <node concept="1WbbFT" id="7PlS3093M84" role="3ix9CU">
+          <ref role="1WbbFS" node="7PlS3093LMo" resolve="AgeReal" />
+        </node>
+      </node>
       <node concept="1fMURV" id="7vcJOhhDCpv" role="1ahQXP">
         <node concept="1fLkTo" id="7vcJOhhDCpw" role="1vMDkh">
           <node concept="1fLbrf" id="7vcJOhhDCpx" role="1fLbpX">
@@ -1716,22 +1749,6 @@
           </node>
         </node>
       </node>
-      <node concept="1ahQXy" id="7vcJOhhDCqI" role="1ahQWs">
-        <property role="TrG5h" value="state" />
-        <node concept="5mh7t" id="7vcJOhhDCqJ" role="3ix9CU">
-          <ref role="5mh6l" node="6OunYCfqjNA" resolve="BuLand" />
-        </node>
-      </node>
-      <node concept="1ahQXy" id="7vcJOhhDCqK" role="1ahQWs">
-        <property role="TrG5h" value="club" />
-        <node concept="2vmvy5" id="7vcJOhhDCqL" role="3ix9CU" />
-      </node>
-      <node concept="1ahQXy" id="7vcJOhhDCqM" role="1ahQWs">
-        <property role="TrG5h" value="age" />
-        <node concept="1WbbFT" id="7PlS3093M84" role="3ix9CU">
-          <ref role="1WbbFS" node="7PlS3093LMo" resolve="AgeReal" />
-        </node>
-      </node>
     </node>
     <node concept="_ixoA" id="6OunYCfqt74" role="_iOnB" />
     <node concept="1aga60" id="5crSXMhjI1" role="_iOnB">
@@ -2530,16 +2547,315 @@
         </node>
       </node>
     </node>
+    <node concept="_ixoA" id="1c6hIxyYh_c" role="_iOnB" />
+    <node concept="1aga60" id="1c6hIxyYixT" role="_iOnB">
+      <property role="TrG5h" value="simpleMulteResults" />
+      <node concept="1fMURV" id="1c6hIxyYj2t" role="1ahQXP">
+        <node concept="1fLkTo" id="1c6hIxyYjeh" role="1vMDkh">
+          <node concept="1fLbrf" id="1c6hIxyYjeC" role="1fLbpX">
+            <ref role="1fLbst" node="1c6hIxyYj2u" />
+            <node concept="2vmpnb" id="1c6hIxyYjeB" role="1fLbpZ" />
+          </node>
+          <node concept="1fLbrf" id="1c6hIxyYjeR" role="1fLbpX">
+            <ref role="1fLbst" node="1c6hIxyYj2v" />
+            <node concept="30bXRB" id="1c6hIxyYjeQ" role="1fLbpZ">
+              <property role="30bXRw" value="1" />
+            </node>
+          </node>
+          <node concept="1fLbrf" id="1c6hIxyYjfv" role="1fLbpX">
+            <ref role="1fLbst" node="1c6hIxyYj9N" resolve="r1" />
+            <node concept="2vmpnb" id="1c6hIxyYjfu" role="1fLbpZ" />
+          </node>
+          <node concept="1fLbrf" id="1c6hIxyYjfK" role="1fLbpX">
+            <ref role="1fLbst" node="1c6hIxyYjdA" resolve="r2" />
+            <node concept="30bdrP" id="1c6hIxyYjfJ" role="1fLbpZ">
+              <property role="30bdrQ" value="done" />
+            </node>
+          </node>
+        </node>
+        <node concept="1fMUR7" id="1c6hIxyYj2u" role="1vMDcl">
+          <node concept="1afdae" id="1c6hIxyYj2O" role="1fMUOQ">
+            <ref role="1afue_" node="1c6hIxyYj13" resolve="v1" />
+          </node>
+        </node>
+        <node concept="1fMUR7" id="1c6hIxyYj2v" role="1vMDcl">
+          <node concept="1afdae" id="1c6hIxyYj6B" role="1fMUOQ">
+            <ref role="1afue_" node="1c6hIxyYj1K" resolve="v2" />
+          </node>
+        </node>
+        <node concept="1fMUOM" id="1c6hIxyYj9N" role="1vMDcl">
+          <property role="TrG5h" value="r1" />
+          <node concept="2vmvy5" id="1c6hIxyYjae" role="1fMUOZ" />
+        </node>
+        <node concept="1fMUOM" id="1c6hIxyYjdA" role="1vMDcl">
+          <property role="TrG5h" value="r2" />
+          <node concept="30bdrU" id="1c6hIxyYjdZ" role="1fMUOZ" />
+        </node>
+        <node concept="1fLkTo" id="1c6hIxyYjhi" role="1vMDkh">
+          <node concept="1fLbrf" id="1c6hIxyYjhT" role="1fLbpX">
+            <ref role="1fLbst" node="1c6hIxyYj2u" />
+            <node concept="2vmpn$" id="1c6hIxyYjhS" role="1fLbpZ" />
+          </node>
+          <node concept="1fLbrf" id="1c6hIxyYji8" role="1fLbpX">
+            <ref role="1fLbst" node="1c6hIxyYj2v" />
+            <node concept="30bXRB" id="1c6hIxyYji7" role="1fLbpZ">
+              <property role="30bXRw" value="2" />
+            </node>
+          </node>
+          <node concept="1fLbrf" id="1c6hIxyYjiM" role="1fLbpX">
+            <ref role="1fLbst" node="1c6hIxyYj9N" resolve="r1" />
+            <node concept="2vmpn$" id="1c6hIxyYjiL" role="1fLbpZ" />
+          </node>
+          <node concept="1fLbrf" id="1c6hIxyYjj3" role="1fLbpX">
+            <ref role="1fLbst" node="1c6hIxyYjdA" resolve="r2" />
+            <node concept="30bdrP" id="1c6hIxyYjj2" role="1fLbpZ">
+              <property role="30bdrQ" value="not done" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="1ahQXy" id="1c6hIxyYj13" role="1ahQWs">
+        <property role="TrG5h" value="v1" />
+        <node concept="2vmvy5" id="1c6hIxyYj1q" role="3ix9CU" />
+      </node>
+      <node concept="1ahQXy" id="1c6hIxyYj1K" role="1ahQWs">
+        <property role="TrG5h" value="v2" />
+        <node concept="30bXR$" id="1c6hIxyYj2h" role="3ix9CU" />
+      </node>
+    </node>
+    <node concept="_ixoA" id="1c6hIxyYjkm" role="_iOnB" />
+    <node concept="2zPypq" id="1c6hIxyYshT" role="_iOnB">
+      <property role="TrG5h" value="res1" />
+      <node concept="1af_rf" id="1c6hIxyYsMg" role="2zPyp_">
+        <ref role="1afhQb" node="1c6hIxyYixT" resolve="simpleMulteResults" />
+        <node concept="2vmpnb" id="1c6hIxyYsM_" role="1afhQ5" />
+        <node concept="30bXRB" id="1c6hIxyYsQr" role="1afhQ5">
+          <property role="30bXRw" value="1" />
+        </node>
+      </node>
+    </node>
+    <node concept="2zPypq" id="1c6hIxyYxZW" role="_iOnB">
+      <property role="TrG5h" value="res2" />
+      <node concept="1af_rf" id="1c6hIxyYxZX" role="2zPyp_">
+        <ref role="1afhQb" node="1c6hIxyYixT" resolve="simpleMulteResults" />
+        <node concept="2vmpn$" id="1c6hIxyYyz0" role="1afhQ5" />
+        <node concept="30bXRB" id="1c6hIxyYxZZ" role="1afhQ5">
+          <property role="30bXRw" value="2" />
+        </node>
+      </node>
+    </node>
+    <node concept="_ixoA" id="1c6hIxyYug3" role="_iOnB" />
+    <node concept="_fkuM" id="1c6hIxyYki5" role="_iOnB">
+      <property role="TrG5h" value="multiDecTableResultAccess" />
+      <node concept="_fkuZ" id="1c6hIxyYsL3" role="_fkp5">
+        <node concept="_fku$" id="1c6hIxyYsL4" role="_fkur" />
+        <node concept="3nOhSe" id="1c6hIxyYwmx" role="_fkuY">
+          <property role="3nOAFM" value="0" />
+          <node concept="_emDc" id="1c6hIxyYsLs" role="3nOhSx">
+            <ref role="_emDf" node="1c6hIxyYshT" resolve="a" />
+          </node>
+        </node>
+        <node concept="2vmpnb" id="1c6hIxyYu6n" role="_fkuS" />
+        <node concept="1z9TsT" id="1c6hIxyY_Vi" role="lGtFl">
+          <node concept="OjmMv" id="1c6hIxyY_Vj" role="1w35rA">
+            <node concept="19SGf9" id="1c6hIxyY_Vk" role="OjmMu">
+              <node concept="19SUe$" id="1c6hIxyY_Vl" role="19SJt6">
+                <property role="19SUeA" value="index access" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="_fkuZ" id="1c6hIxyY_Q4" role="_fkp5">
+        <node concept="_fku$" id="1c6hIxyY_Q5" role="_fkur" />
+        <node concept="3nOhSe" id="1c6hIxyY_Q6" role="_fkuY">
+          <property role="3nOAFM" value="1" />
+          <node concept="_emDc" id="1c6hIxyY_Q7" role="3nOhSx">
+            <ref role="_emDf" node="1c6hIxyYshT" resolve="res1" />
+          </node>
+        </node>
+        <node concept="30bdrP" id="1c6hIxyY_Uo" role="_fkuS">
+          <property role="30bdrQ" value="done" />
+        </node>
+      </node>
+      <node concept="_fkuZ" id="1c6hIxyYAkW" role="_fkp5">
+        <node concept="_fku$" id="1c6hIxyYAkX" role="_fkur" />
+        <node concept="3nOhSe" id="1c6hIxyYAkY" role="_fkuY">
+          <property role="3nOAFM" value="0" />
+          <node concept="_emDc" id="1c6hIxyYAkZ" role="3nOhSx">
+            <ref role="_emDf" node="1c6hIxyYxZW" resolve="res2" />
+          </node>
+        </node>
+        <node concept="2vmpn$" id="1c6hIxyYAu5" role="_fkuS" />
+      </node>
+      <node concept="_fkuZ" id="1c6hIxyYxUd" role="_fkp5">
+        <node concept="_fku$" id="1c6hIxyYxUe" role="_fkur" />
+        <node concept="3nOhSe" id="1c6hIxyYxUf" role="_fkuY">
+          <property role="3nOAFM" value="1" />
+          <node concept="_emDc" id="1c6hIxyYxUg" role="3nOhSx">
+            <ref role="_emDf" node="1c6hIxyYxZW" resolve="res2" />
+          </node>
+        </node>
+        <node concept="30bdrP" id="1c6hIxyYxXi" role="_fkuS">
+          <property role="30bdrQ" value="not done" />
+        </node>
+      </node>
+      <node concept="3dYjL0" id="1c6hIxyY_Wf" role="_fkp5" />
+      <node concept="_fkuZ" id="1c6hIxyY_FZ" role="_fkp5">
+        <node concept="_fku$" id="1c6hIxyY_G0" role="_fkur" />
+        <node concept="1QScDb" id="1c6hIxyY_H2" role="_fkuY">
+          <node concept="383P9U" id="1c6hIxyY_LS" role="1QScD9">
+            <ref role="383OOP" node="1c6hIxyYj9N" resolve="r1" />
+          </node>
+          <node concept="_emDc" id="1c6hIxyY_GB" role="30czhm">
+            <ref role="_emDf" node="1c6hIxyYshT" resolve="res1" />
+          </node>
+        </node>
+        <node concept="2vmpnb" id="1c6hIxyY_P9" role="_fkuS" />
+        <node concept="1z9TsT" id="1c6hIxyY_WT" role="lGtFl">
+          <node concept="OjmMv" id="1c6hIxyY_WU" role="1w35rA">
+            <node concept="19SGf9" id="1c6hIxyY_WV" role="OjmMu">
+              <node concept="19SUe$" id="1c6hIxyY_WW" role="19SJt6">
+                <property role="19SUeA" value="named access" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="_fkuZ" id="1c6hIxyY_Ph" role="_fkp5">
+        <node concept="_fku$" id="1c6hIxyY_Pi" role="_fkur" />
+        <node concept="1QScDb" id="1c6hIxyY_Pj" role="_fkuY">
+          <node concept="383P9U" id="1c6hIxyYAhi" role="1QScD9">
+            <ref role="383OOP" node="1c6hIxyYjdA" resolve="r2" />
+          </node>
+          <node concept="_emDc" id="1c6hIxyY_Pl" role="30czhm">
+            <ref role="_emDf" node="1c6hIxyYshT" resolve="res1" />
+          </node>
+        </node>
+        <node concept="30bdrP" id="1c6hIxyYAkM" role="_fkuS">
+          <property role="30bdrQ" value="done" />
+        </node>
+      </node>
+      <node concept="_fkuZ" id="1c6hIxyYD_Z" role="_fkp5">
+        <node concept="_fku$" id="1c6hIxyYDA0" role="_fkur" />
+        <node concept="1QScDb" id="1c6hIxyYDFG" role="_fkuY">
+          <node concept="383P9U" id="1c6hIxyYDLF" role="1QScD9">
+            <ref role="383OOP" node="1c6hIxyYj9N" resolve="r1" />
+          </node>
+          <node concept="_emDc" id="1c6hIxyYDA2" role="30czhm">
+            <ref role="_emDf" node="1c6hIxyYxZW" resolve="res2" />
+          </node>
+        </node>
+        <node concept="2vmpn$" id="1c6hIxyYDA3" role="_fkuS" />
+      </node>
+      <node concept="_fkuZ" id="1c6hIxyYDA4" role="_fkp5">
+        <node concept="_fku$" id="1c6hIxyYDA5" role="_fkur" />
+        <node concept="1QScDb" id="1c6hIxyYDTT" role="_fkuY">
+          <node concept="383P9U" id="1c6hIxyYDYW" role="1QScD9">
+            <ref role="383OOP" node="1c6hIxyYjdA" resolve="r2" />
+          </node>
+          <node concept="_emDc" id="1c6hIxyYDA7" role="30czhm">
+            <ref role="_emDf" node="1c6hIxyYxZW" resolve="res2" />
+          </node>
+        </node>
+        <node concept="30bdrP" id="1c6hIxyYDA8" role="_fkuS">
+          <property role="30bdrQ" value="not done" />
+        </node>
+      </node>
+      <node concept="3dYjL0" id="1c6hIxz1PJ9" role="_fkp5" />
+      <node concept="_fkuZ" id="1c6hIxz1PL8" role="_fkp5">
+        <node concept="_fku$" id="1c6hIxz1PL9" role="_fkur" />
+        <node concept="3nOhSe" id="1c6hIxz1PMh" role="_fkuY">
+          <property role="3nOAFM" value="0" />
+          <node concept="_emDc" id="1c6hIxz1PMi" role="3nOhSx">
+            <ref role="_emDf" node="1c6hIxyYshT" resolve="res1" />
+          </node>
+        </node>
+        <node concept="1QScDb" id="1c6hIxz1PMx" role="_fkuS">
+          <node concept="383P9U" id="1c6hIxz1PMy" role="1QScD9">
+            <ref role="383OOP" node="1c6hIxyYj9N" resolve="r1" />
+          </node>
+          <node concept="_emDc" id="1c6hIxz1PMz" role="30czhm">
+            <ref role="_emDf" node="1c6hIxyYshT" resolve="res1" />
+          </node>
+        </node>
+        <node concept="1z9TsT" id="1c6hIxz1Rla" role="lGtFl">
+          <node concept="OjmMv" id="1c6hIxz1Rlb" role="1w35rA">
+            <node concept="19SGf9" id="1c6hIxz1Rlc" role="OjmMu">
+              <node concept="19SUe$" id="1c6hIxz1Rld" role="19SJt6">
+                <property role="19SUeA" value="both ways of access are identical" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="_fkuZ" id="1c6hIxz1R_F" role="_fkp5">
+        <node concept="_fku$" id="1c6hIxz1R_G" role="_fkur" />
+        <node concept="3nOhSe" id="1c6hIxz1R_H" role="_fkuY">
+          <property role="3nOAFM" value="1" />
+          <node concept="_emDc" id="1c6hIxz1R_I" role="3nOhSx">
+            <ref role="_emDf" node="1c6hIxyYshT" resolve="res1" />
+          </node>
+        </node>
+        <node concept="1QScDb" id="1c6hIxz1RBW" role="_fkuS">
+          <node concept="383P9U" id="1c6hIxz1RDm" role="1QScD9">
+            <ref role="383OOP" node="1c6hIxyYjdA" resolve="r2" />
+          </node>
+          <node concept="_emDc" id="1c6hIxz1RBY" role="30czhm">
+            <ref role="_emDf" node="1c6hIxyYshT" resolve="res1" />
+          </node>
+        </node>
+      </node>
+      <node concept="_fkuZ" id="1c6hIxz1R_K" role="_fkp5">
+        <node concept="_fku$" id="1c6hIxz1R_L" role="_fkur" />
+        <node concept="3nOhSe" id="1c6hIxz1R_M" role="_fkuY">
+          <property role="3nOAFM" value="0" />
+          <node concept="_emDc" id="1c6hIxz1R_N" role="3nOhSx">
+            <ref role="_emDf" node="1c6hIxyYxZW" resolve="res2" />
+          </node>
+        </node>
+        <node concept="1QScDb" id="1c6hIxz1RIp" role="_fkuS">
+          <node concept="383P9U" id="1c6hIxz1RIq" role="1QScD9">
+            <ref role="383OOP" node="1c6hIxyYj9N" resolve="r1" />
+          </node>
+          <node concept="_emDc" id="1c6hIxz1RIr" role="30czhm">
+            <ref role="_emDf" node="1c6hIxyYxZW" resolve="res2" />
+          </node>
+        </node>
+      </node>
+      <node concept="_fkuZ" id="1c6hIxz1R_P" role="_fkp5">
+        <node concept="_fku$" id="1c6hIxz1R_Q" role="_fkur" />
+        <node concept="3nOhSe" id="1c6hIxz1R_R" role="_fkuY">
+          <property role="3nOAFM" value="1" />
+          <node concept="_emDc" id="1c6hIxz1R_S" role="3nOhSx">
+            <ref role="_emDf" node="1c6hIxyYxZW" resolve="res2" />
+          </node>
+        </node>
+        <node concept="1QScDb" id="1c6hIxz1RNU" role="_fkuS">
+          <node concept="383P9U" id="1c6hIxz1RUA" role="1QScD9">
+            <ref role="383OOP" node="1c6hIxyYjdA" resolve="r2" />
+          </node>
+          <node concept="_emDc" id="1c6hIxz1RNW" role="30czhm">
+            <ref role="_emDf" node="1c6hIxyYxZW" resolve="res2" />
+          </node>
+        </node>
+      </node>
+      <node concept="3dYjL0" id="1c6hIxyYD_d" role="_fkp5" />
+      <node concept="_fkuZ" id="1c6hIxyYkKY" role="_fkp5">
+        <node concept="_fku$" id="1c6hIxyYkKZ" role="_fkur" />
+        <node concept="1af_rf" id="1c6hIxyYkLd" role="_fkuY">
+          <ref role="1afhQb" node="1c6hIxyYixT" resolve="simpleMulteResults" />
+          <node concept="2vmpnb" id="1c6hIxyYkLt" role="1afhQ5" />
+          <node concept="30bXRB" id="1c6hIxyYkMW" role="1afhQ5">
+            <property role="30bXRw" value="1" />
+          </node>
+        </node>
+        <node concept="_emDc" id="1c6hIxyYAuo" role="_fkuS">
+          <ref role="_emDf" node="1c6hIxyYshT" resolve="res1" />
+        </node>
+      </node>
+    </node>
     <node concept="_ixoA" id="2FeCPobfLI5" role="_iOnB" />
-    <node concept="_ixoA" id="5crSXMhjIX" role="_iOnB" />
-    <node concept="_ixoA" id="5crSXMhjIY" role="_iOnB" />
-    <node concept="_ixoA" id="5crSXMhjIZ" role="_iOnB" />
-    <node concept="_ixoA" id="5crSXMhjJ0" role="_iOnB" />
-    <node concept="_ixoA" id="5crSXMhjJ1" role="_iOnB" />
-    <node concept="_ixoA" id="5crSXMhjJ2" role="_iOnB" />
-    <node concept="_ixoA" id="5crSXMhjJ3" role="_iOnB" />
-    <node concept="_ixoA" id="6OunYCfqyOM" role="_iOnB" />
-    <node concept="_ixoA" id="6OunYCfqyJy" role="_iOnB" />
   </node>
   <node concept="_iOnU" id="7cMSAcS9CTj">
     <property role="1XBH2A" value="true" />

From 8039c3195ecfd3be5ae105581101bda34996ab8c Mon Sep 17 00:00:00 2001
From: Alexander Rimer <rimer@itemis.de>
Date: Wed, 31 Jan 2024 18:19:57 +0100
Subject: [PATCH 06/14] expr.base.interpreter: added support for inline tuple
 access

---
 .../models/plugin.mps                         | 114 ++++++++++++++++++
 1 file changed, 114 insertions(+)

diff --git a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.base.interpreter/models/plugin.mps b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.base.interpreter/models/plugin.mps
index 30acd3663c..a07c499be4 100644
--- a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.base.interpreter/models/plugin.mps
+++ b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.base.interpreter/models/plugin.mps
@@ -307,6 +307,7 @@
       <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160600644654" name="jetbrains.mps.baseLanguage.collections.structure.ListCreatorWithInit" flags="nn" index="Tc6Ow" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
+      <concept id="1171391069720" name="jetbrains.mps.baseLanguage.collections.structure.GetIndexOfOperation" flags="nn" index="2WmjW8" />
       <concept id="1162935959151" name="jetbrains.mps.baseLanguage.collections.structure.GetSizeOperation" flags="nn" index="34oBXx" />
       <concept id="1165525191778" name="jetbrains.mps.baseLanguage.collections.structure.GetFirstOperation" flags="nn" index="1uHKPH" />
       <concept id="1225711141656" name="jetbrains.mps.baseLanguage.collections.structure.ListElementAccessExpression" flags="nn" index="1y4W85">
@@ -3269,6 +3270,119 @@
         </node>
       </node>
     </node>
+    <node concept="qq9P1" id="1c6hIxyZalq" role="qq9xR">
+      <property role="2TnfIJ" value="true" />
+      <ref role="qq9wM" to="hm2y:6GiZkUz7qWO" resolve="InlinedNamedTupleAccess" />
+      <node concept="3vetai" id="1c6hIxyZdOK" role="3vQZUl">
+        <node concept="2OqwBi" id="1c6hIxyZdOY" role="3vdyny">
+          <node concept="2ShNRf" id="1c6hIxyZdOZ" role="2Oq$k0">
+            <node concept="1pGfFk" id="1c6hIxyZdP0" role="2ShVmc">
+              <ref role="37wK5l" to="xfg9:3nVyItrYOln" resolve="NixSupport" />
+              <node concept="2OqwBi" id="1c6hIxyZhfT" role="37wK5m">
+                <node concept="oxGPV" id="1c6hIxyZgMY" role="2Oq$k0" />
+                <node concept="2qgKlT" id="1c6hIxyZhOV" role="2OqNvi">
+                  <ref role="37wK5l" to="pbu6:6GiZkUzfnDf" resolve="expression" />
+                </node>
+              </node>
+              <node concept="oxGPV" id="1c6hIxyZdP2" role="37wK5m" />
+              <node concept="1bVj0M" id="1c6hIxyZdP3" role="37wK5m">
+                <node concept="37vLTG" id="1c6hIxyZdP4" role="1bW2Oz">
+                  <property role="TrG5h" value="ns" />
+                  <node concept="3uibUv" id="1c6hIxyZdP5" role="1tU5fm">
+                    <ref role="3uigEE" to="xfg9:3nVyItrYOkv" resolve="NixSupport" />
+                  </node>
+                </node>
+                <node concept="3clFbS" id="1c6hIxyZdP6" role="1bW5cS">
+                  <node concept="3cpWs8" id="1c6hIxyZdP7" role="3cqZAp">
+                    <node concept="3cpWsn" id="1c6hIxyZdP8" role="3cpWs9">
+                      <property role="TrG5h" value="list" />
+                      <node concept="_YKpA" id="1c6hIxyZdP9" role="1tU5fm">
+                        <node concept="3uibUv" id="1c6hIxyZdPa" role="_ZDj9">
+                          <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
+                        </node>
+                      </node>
+                      <node concept="1eOMI4" id="1c6hIxyZdPb" role="33vP2m">
+                        <node concept="10QFUN" id="1c6hIxyZdPc" role="1eOMHV">
+                          <node concept="_YKpA" id="1c6hIxyZdPd" role="10QFUM">
+                            <node concept="3uibUv" id="1c6hIxyZdPe" role="_ZDj9">
+                              <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
+                            </node>
+                          </node>
+                          <node concept="qpA2v" id="1c6hIxyZiM4" role="10QFUP">
+                            <node concept="2OqwBi" id="1c6hIxyZjAy" role="3SLO0q">
+                              <node concept="oxGPV" id="1c6hIxyZjc2" role="2Oq$k0" />
+                              <node concept="2qgKlT" id="1c6hIxyZjWQ" role="2OqNvi">
+                                <ref role="37wK5l" to="pbu6:6zmBjqUivyF" resolve="contextExpression" />
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="3cpWs8" id="1c6hIxyZdPj" role="3cqZAp">
+                    <node concept="3cpWsn" id="1c6hIxyZdPk" role="3cpWs9">
+                      <property role="TrG5h" value="index" />
+                      <node concept="10Oyi0" id="1c6hIxyZdPl" role="1tU5fm" />
+                      <node concept="2OqwBi" id="1c6hIxyZqw5" role="33vP2m">
+                        <node concept="2OqwBi" id="1c6hIxyZorg" role="2Oq$k0">
+                          <node concept="2OqwBi" id="1c6hIxyZdPm" role="2Oq$k0">
+                            <node concept="oxGPV" id="1c6hIxyZdPn" role="2Oq$k0" />
+                            <node concept="2qgKlT" id="1c6hIxyZnTh" role="2OqNvi">
+                              <ref role="37wK5l" to="pbu6:1c6hIxyZnje" resolve="tupleDeclaration" />
+                            </node>
+                          </node>
+                          <node concept="2qgKlT" id="1c6hIxyZoF8" role="2OqNvi">
+                            <ref role="37wK5l" to="pbu6:5r47dOfJ8UL" resolve="getMembers" />
+                          </node>
+                        </node>
+                        <node concept="2WmjW8" id="1c6hIxyZt1$" role="2OqNvi">
+                          <node concept="2OqwBi" id="1c6hIxyZt$B" role="25WWJ7">
+                            <node concept="oxGPV" id="1c6hIxyZt7A" role="2Oq$k0" />
+                            <node concept="3TrEf2" id="1c6hIxyZu7j" role="2OqNvi">
+                              <ref role="3Tt5mk" to="hm2y:6GiZkUz7r1V" resolve="member" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="3cpWs6" id="1c6hIxyZdPp" role="3cqZAp">
+                    <node concept="3K4zz7" id="1c6hIxyZdPq" role="3cqZAk">
+                      <node concept="10Nm6u" id="1c6hIxyZdPr" role="3K4GZi" />
+                      <node concept="1eOMI4" id="1c6hIxyZdPs" role="3K4Cdx">
+                        <node concept="3eOVzh" id="1c6hIxyZdPt" role="1eOMHV">
+                          <node concept="2OqwBi" id="1c6hIxyZdPu" role="3uHU7w">
+                            <node concept="37vLTw" id="1c6hIxyZdPv" role="2Oq$k0">
+                              <ref role="3cqZAo" node="1c6hIxyZdP8" resolve="list" />
+                            </node>
+                            <node concept="34oBXx" id="1c6hIxyZdPw" role="2OqNvi" />
+                          </node>
+                          <node concept="37vLTw" id="1c6hIxyZdPx" role="3uHU7B">
+                            <ref role="3cqZAo" node="1c6hIxyZdPk" resolve="index" />
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="1y4W85" id="1c6hIxyZdPy" role="3K4E3e">
+                        <node concept="37vLTw" id="1c6hIxyZdPz" role="1y566C">
+                          <ref role="3cqZAo" node="1c6hIxyZdP8" resolve="list" />
+                        </node>
+                        <node concept="37vLTw" id="1c6hIxyZdP$" role="1y58nS">
+                          <ref role="3cqZAo" node="1c6hIxyZdPk" resolve="index" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="liA8E" id="1c6hIxyZdP_" role="2OqNvi">
+            <ref role="37wK5l" to="xfg9:26cjRABQZG3" resolve="run" />
+          </node>
+        </node>
+      </node>
+    </node>
     <node concept="qq9P1" id="uGVYUik42y" role="qq9xR">
       <property role="2TnfIJ" value="true" />
       <ref role="qq9wM" to="hm2y:4rZeNQ6OJ4v" resolve="ParensExpression" />

From ddbfb70b57181dae5b6f7a0a5f76fc6bf7c5e7d4 Mon Sep 17 00:00:00 2001
From: Alexander Rimer <rimer@itemis.de>
Date: Sun, 4 Feb 2024 21:14:45 +0100
Subject: [PATCH 07/14] expr.base: renaming

---
 .../languages/org.iets3.core.expr.base/models/behavior.mps  | 2 +-
 .../org.iets3.core.expr.base/models/constraints.mps         | 2 +-
 .../languages/org.iets3.core.expr.base/models/editor.mps    | 6 +++---
 .../languages/org.iets3.core.expr.base/models/structure.mps | 2 +-
 .../org.iets3.core.expr.base/models/typesystem.mps          | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/behavior.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/behavior.mps
index d9fcff7711..b549599688 100755
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/behavior.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/behavior.mps
@@ -27409,7 +27409,7 @@
   </node>
   <node concept="13h7C7" id="6GiZkUz7qWV">
     <property role="3GE5qa" value="tuples" />
-    <ref role="13h7C2" to="hm2y:6GiZkUz7qWO" resolve="InlinedNamedTupleAccess" />
+    <ref role="13h7C2" to="hm2y:6GiZkUz7qWO" resolve="InlineNamedTupleAccess" />
     <node concept="13hLZK" id="6GiZkUz7qWW" role="13h7CW">
       <node concept="3clFbS" id="6GiZkUz7qWX" role="2VODD2" />
     </node>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/constraints.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/constraints.mps
index 8b67e422f3..946086ca83 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/constraints.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/constraints.mps
@@ -1100,7 +1100,7 @@
   </node>
   <node concept="1M2fIO" id="6GiZkUz7$Pr">
     <property role="3GE5qa" value="tuples" />
-    <ref role="1M2myG" to="hm2y:6GiZkUz7qWO" resolve="InlinedNamedTupleAccess" />
+    <ref role="1M2myG" to="hm2y:6GiZkUz7qWO" resolve="InlineNamedTupleAccess" />
     <node concept="9S07l" id="6GiZkUz7$Ps" role="9Vyp8">
       <node concept="3clFbS" id="6GiZkUz7$Pt" role="2VODD2">
         <node concept="3clFbF" id="6GiZkUz7$X6" role="3cqZAp">
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/editor.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/editor.mps
index 72f53eb6ab..a19f4b8e0d 100755
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/editor.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/editor.mps
@@ -7220,7 +7220,7 @@
   </node>
   <node concept="22mcaB" id="6GiZkUz7t5K">
     <property role="3GE5qa" value="tuples" />
-    <ref role="aqKnT" to="hm2y:6GiZkUz7qWO" resolve="InlinedNamedTupleAccess" />
+    <ref role="aqKnT" to="hm2y:6GiZkUz7qWO" resolve="InlineNamedTupleAccess" />
     <node concept="2F$Pav" id="2Q7faZZqpyr" role="3ft7WO">
       <node concept="3eGOop" id="2Q7faZZrL1w" role="2$S_pN">
         <node concept="ucgPf" id="2Q7faZZrL1y" role="3aKz83">
@@ -7228,7 +7228,7 @@
             <node concept="3clFbF" id="2Q7faZZrLgx" role="3cqZAp">
               <node concept="2pJPEk" id="2Q7faZZrLgv" role="3clFbG">
                 <node concept="2pJPED" id="2Q7faZZrLmR" role="2pJPEn">
-                  <ref role="2pJxaS" to="hm2y:6GiZkUz7qWO" resolve="InlinedNamedTupleAccess" />
+                  <ref role="2pJxaS" to="hm2y:6GiZkUz7qWO" resolve="InlineNamedTupleAccess" />
                   <node concept="2pIpSj" id="6GiZkUz7zPx" role="2pJxcM">
                     <ref role="2pIpSl" to="hm2y:6GiZkUz7r1V" resolve="member" />
                     <node concept="36biLy" id="6GiZkUz7zSt" role="28nt2d">
@@ -7354,7 +7354,7 @@
   </node>
   <node concept="24kQdi" id="6GiZkUzcMTp">
     <property role="3GE5qa" value="tuples" />
-    <ref role="1XX52x" to="hm2y:6GiZkUz7qWO" resolve="InlinedNamedTupleAccess" />
+    <ref role="1XX52x" to="hm2y:6GiZkUz7qWO" resolve="InlineNamedTupleAccess" />
     <node concept="1iCGBv" id="6GiZkUzcMTr" role="2wV5jI">
       <ref role="1NtTu8" to="hm2y:6GiZkUz7r1V" resolve="member" />
       <node concept="1sVBvm" id="6GiZkUzcMTt" role="1sWHZn">
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/structure.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/structure.mps
index 9ab265f206..e7c338cf8a 100755
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/structure.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/structure.mps
@@ -2221,7 +2221,7 @@
   <node concept="1TIwiD" id="6GiZkUz7qWO">
     <property role="EcuMT" value="7715507625824988980" />
     <property role="3GE5qa" value="tuples" />
-    <property role="TrG5h" value="InlinedNamedTupleAccess" />
+    <property role="TrG5h" value="InlineNamedTupleAccess" />
     <ref role="1TJDcQ" to="tpck:gw2VY9q" />
     <node concept="1TJgyj" id="6GiZkUz7r1V" role="1TKVEi">
       <property role="IQ2ns" value="7715507625824989307" />
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/typesystem.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/typesystem.mps
index 78a1a62981..2242572f48 100755
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/typesystem.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/typesystem.mps
@@ -11059,7 +11059,7 @@
     </node>
     <node concept="1YaCAy" id="6GiZkUz7CB4" role="1YuTPh">
       <property role="TrG5h" value="inta" />
-      <ref role="1YaFvo" to="hm2y:6GiZkUz7qWO" resolve="InlinedNamedTupleAccess" />
+      <ref role="1YaFvo" to="hm2y:6GiZkUz7qWO" resolve="InlineNamedTupleAccess" />
     </node>
   </node>
 </model>

From 691e6e4c34b84ab9bf176db5ac28cb9368744037 Mon Sep 17 00:00:00 2001
From: Alexander Rimer <rimer@itemis.de>
Date: Sun, 4 Feb 2024 21:28:15 +0100
Subject: [PATCH 08/14] genjava.base: added support for InlineTupleType

---
 ...iets3.core.expr.genjava.base@generator.mps | 28 +++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.base/generator/template/org.iets3.core.expr.genjava.base@generator.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.base/generator/template/org.iets3.core.expr.genjava.base@generator.mps
index d3d45b0f0a..af4923b457 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.base/generator/template/org.iets3.core.expr.genjava.base@generator.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.base/generator/template/org.iets3.core.expr.genjava.base@generator.mps
@@ -16443,6 +16443,34 @@
         </node>
       </node>
     </node>
+    <node concept="3aamgX" id="3r6ed$FPwzm" role="3aUrZf">
+      <property role="36QftV" value="true" />
+      <ref role="30HIoZ" to="hm2y:5r47dOfJ9kS" resolve="InlineTupleType" />
+      <node concept="1Koe21" id="3r6ed$FPwRi" role="1lVwrX">
+        <node concept="3clFb_" id="3r6ed$FPwRj" role="1Koe22">
+          <property role="DiZV1" value="false" />
+          <property role="od$2w" value="false" />
+          <property role="2aFKle" value="false" />
+          <property role="TrG5h" value="foo" />
+          <node concept="3Tm1VV" id="3r6ed$FPwRk" role="1B3o_S" />
+          <node concept="3cqZAl" id="3r6ed$FPwRl" role="3clF45" />
+          <node concept="3clFbS" id="3r6ed$FPwRm" role="3clF47">
+            <node concept="3cpWs8" id="3r6ed$FPwRn" role="3cqZAp">
+              <node concept="3cpWsn" id="3r6ed$FPwRo" role="3cpWs9">
+                <property role="TrG5h" value="l" />
+                <node concept="3uibUv" id="3r6ed$FPwRp" role="1tU5fm">
+                  <ref role="3uigEE" to="j10v:~PVector" resolve="PVector" />
+                  <node concept="3uibUv" id="3r6ed$FPwRq" role="11_B2D">
+                    <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
+                  </node>
+                  <node concept="raruj" id="3r6ed$FPwRr" role="lGtFl" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
     <node concept="3aamgX" id="2ICvjpm0spc" role="3aUrZf">
       <ref role="30HIoZ" to="hm2y:5BNZGjBtUbJ" resolve="AttemptType" />
       <node concept="1Koe21" id="5gxCh1pibTF" role="1lVwrX">

From 0c02fe2a18d6f67b813e1ff2c0b9e6f7d8d1c436 Mon Sep 17 00:00:00 2001
From: Alexander Rimer <rimer@itemis.de>
Date: Sun, 4 Feb 2024 23:43:28 +0100
Subject: [PATCH 09/14] genjava.util: added desugaring for
 InlineNamedTupleAccess

named tuple access is mapped to regular index access.
---
 ...iets3.core.expr.genjava.util@generator.mps | 121 ++++++++++++++++++
 1 file changed, 121 insertions(+)

diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.util/generator/template/org.iets3.core.expr.genjava.util@generator.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.util/generator/template/org.iets3.core.expr.genjava.util@generator.mps
index a2fc9035d1..3e55a1c89c 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.util/generator/template/org.iets3.core.expr.genjava.util@generator.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.util/generator/template/org.iets3.core.expr.genjava.util@generator.mps
@@ -24,6 +24,7 @@
     <import index="tpee" ref="r:00000000-0000-4000-0000-011c895902ca(jetbrains.mps.baseLanguage.structure)" />
     <import index="5qo5" ref="r:6d93ddb1-b0b0-4eee-8079-51303666672a(org.iets3.core.expr.simpleTypes.structure)" />
     <import index="zzzn" ref="r:af0af2e7-f7e1-4536-83b5-6bf010d4afd2(org.iets3.core.expr.lambda.structure)" implicit="true" />
+    <import index="pbu6" ref="r:83e946de-2a7f-4a4c-b3c9-4f671aa7f2db(org.iets3.core.expr.base.behavior)" implicit="true" />
   </imports>
   <registry>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
@@ -133,6 +134,10 @@
         <child id="2245119349904068815" name="max" index="1eiLjC" />
         <child id="2245119349904068814" name="min" index="1eiLjD" />
       </concept>
+      <concept id="2527679671886479690" name="org.iets3.core.expr.base.structure.TupleAccessExpr" flags="ng" index="3nOhSe">
+        <property id="2527679671886575030" name="index" index="3nOAFM" />
+        <child id="2527679671886479717" name="tuple" index="3nOhSx" />
+      </concept>
       <concept id="9002563722476995145" name="org.iets3.core.expr.base.structure.DotExpression" flags="ng" index="1QScDb">
         <child id="9002563722476995147" name="target" index="1QScD9" />
       </concept>
@@ -393,6 +398,7 @@
       <concept id="1235566831861" name="jetbrains.mps.baseLanguage.collections.structure.AllOperation" flags="nn" index="2HxqBE" />
       <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
+      <concept id="1171391069720" name="jetbrains.mps.baseLanguage.collections.structure.GetIndexOfOperation" flags="nn" index="2WmjW8" />
       <concept id="1162935959151" name="jetbrains.mps.baseLanguage.collections.structure.GetSizeOperation" flags="nn" index="34oBXx" />
       <concept id="1165525191778" name="jetbrains.mps.baseLanguage.collections.structure.GetFirstOperation" flags="nn" index="1uHKPH" />
       <concept id="1225711141656" name="jetbrains.mps.baseLanguage.collections.structure.ListElementAccessExpression" flags="nn" index="1y4W85">
@@ -449,6 +455,121 @@
         <ref role="v9R2y" node="72ypUwEmbIo" resolve="reduce_KFMaybeNot" />
       </node>
     </node>
+    <node concept="3aamgX" id="5gz1ElMD82_" role="3acgRq">
+      <ref role="30HIoZ" to="hm2y:7NJy08a3O99" resolve="DotExpression" />
+      <node concept="1Koe21" id="5gz1ElMEvof" role="1lVwrX">
+        <node concept="1aga60" id="5gz1ElML$3G" role="1Koe22">
+          <property role="TrG5h" value="a" />
+          <node concept="1aduha" id="5gz1ElML$61" role="1ahQXP">
+            <node concept="1adJid" id="5gz1ElML$8A" role="1aduh9">
+              <property role="TrG5h" value="tuple" />
+              <node concept="m5g4o" id="5gz1ElML$8Y" role="1adJij">
+                <node concept="30bXRB" id="5gz1ElML$9b" role="m5g4p">
+                  <property role="30bXRw" value="0" />
+                </node>
+                <node concept="30bXRB" id="5gz1ElML$bs" role="m5g4p">
+                  <property role="30bXRw" value="1" />
+                </node>
+              </node>
+            </node>
+            <node concept="3nOhSe" id="5gz1ElML$Y5" role="1aduh9">
+              <property role="3nOAFM" value="0" />
+              <node concept="1adzI2" id="5gz1ElML$yD" role="3nOhSx">
+                <ref role="1adwt6" node="5gz1ElML$8A" resolve="tuple" />
+                <node concept="29HgVG" id="5gz1ElMNdqW" role="lGtFl">
+                  <node concept="3NFfHV" id="5gz1ElMNdqX" role="3NFExx">
+                    <node concept="3clFbS" id="5gz1ElMNdqY" role="2VODD2">
+                      <node concept="3clFbF" id="5gz1ElMNdr4" role="3cqZAp">
+                        <node concept="2OqwBi" id="5gz1ElMNdqZ" role="3clFbG">
+                          <node concept="3TrEf2" id="5gz1ElMNdr2" role="2OqNvi">
+                            <ref role="3Tt5mk" to="hm2y:4rZeNQ6NgXF" resolve="expr" />
+                          </node>
+                          <node concept="30H73N" id="5gz1ElMNdr3" role="2Oq$k0" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="raruj" id="5gz1ElML_bE" role="lGtFl" />
+              <node concept="17Uvod" id="5gz1ElMNcjK" role="lGtFl">
+                <property role="2qtEX9" value="index" />
+                <property role="P4ACc" value="cfaa4966-b7d5-4b69-b66a-309a6e1a7290/2527679671886479690/2527679671886575030" />
+                <node concept="3zFVjK" id="5gz1ElMNcjL" role="3zH0cK">
+                  <node concept="3clFbS" id="5gz1ElMNcjM" role="2VODD2">
+                    <node concept="3cpWs8" id="476Fj4USt1c" role="3cqZAp">
+                      <node concept="3cpWsn" id="476Fj4USt1d" role="3cpWs9">
+                        <property role="TrG5h" value="access" />
+                        <node concept="3Tqbb2" id="476Fj4USpJ1" role="1tU5fm">
+                          <ref role="ehGHo" to="hm2y:6GiZkUz7qWO" resolve="InlineNamedTupleAccess" />
+                        </node>
+                        <node concept="1PxgMI" id="476Fj4USt1e" role="33vP2m">
+                          <node concept="chp4Y" id="476Fj4USt1f" role="3oSUPX">
+                            <ref role="cht4Q" to="hm2y:6GiZkUz7qWO" resolve="InlineNamedTupleAccess" />
+                          </node>
+                          <node concept="2OqwBi" id="476Fj4USt1g" role="1m5AlR">
+                            <node concept="30H73N" id="476Fj4USt1h" role="2Oq$k0" />
+                            <node concept="3TrEf2" id="476Fj4USt1i" role="2OqNvi">
+                              <ref role="3Tt5mk" to="hm2y:7NJy08a3O9b" resolve="target" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="3clFbF" id="476Fj4USxRH" role="3cqZAp">
+                      <node concept="2OqwBi" id="476Fj4USIYr" role="3clFbG">
+                        <node concept="2OqwBi" id="476Fj4USzfO" role="2Oq$k0">
+                          <node concept="2OqwBi" id="476Fj4USyff" role="2Oq$k0">
+                            <node concept="37vLTw" id="476Fj4USxRF" role="2Oq$k0">
+                              <ref role="3cqZAo" node="476Fj4USt1d" resolve="access" />
+                            </node>
+                            <node concept="2qgKlT" id="476Fj4USyJK" role="2OqNvi">
+                              <ref role="37wK5l" to="pbu6:1c6hIxyZnje" resolve="tupleDeclaration" />
+                            </node>
+                          </node>
+                          <node concept="2qgKlT" id="476Fj4USzVt" role="2OqNvi">
+                            <ref role="37wK5l" to="pbu6:5r47dOfJ8UL" resolve="getMembers" />
+                          </node>
+                        </node>
+                        <node concept="2WmjW8" id="476Fj4USK6O" role="2OqNvi">
+                          <node concept="2OqwBi" id="476Fj4USH8y" role="25WWJ7">
+                            <node concept="37vLTw" id="476Fj4USGDM" role="2Oq$k0">
+                              <ref role="3cqZAo" node="476Fj4USt1d" resolve="access" />
+                            </node>
+                            <node concept="3TrEf2" id="476Fj4USHHJ" role="2OqNvi">
+                              <ref role="3Tt5mk" to="hm2y:6GiZkUz7r1V" resolve="member" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="30G5F_" id="5gz1ElMLwjE" role="30HLyM">
+        <node concept="3clFbS" id="5gz1ElMLwjF" role="2VODD2">
+          <node concept="3clFbF" id="5gz1ElMLwp0" role="3cqZAp">
+            <node concept="2OqwBi" id="5gz1ElMLyXp" role="3clFbG">
+              <node concept="2OqwBi" id="5gz1ElMLwBq" role="2Oq$k0">
+                <node concept="30H73N" id="5gz1ElMLwoZ" role="2Oq$k0" />
+                <node concept="3TrEf2" id="5gz1ElMLyAC" role="2OqNvi">
+                  <ref role="3Tt5mk" to="hm2y:7NJy08a3O9b" resolve="target" />
+                </node>
+              </node>
+              <node concept="1mIQ4w" id="5gz1ElMLzfs" role="2OqNvi">
+                <node concept="chp4Y" id="5gz1ElMLzik" role="cj9EA">
+                  <ref role="cht4Q" to="hm2y:6GiZkUz7qWO" resolve="InlineNamedTupleAccess" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
     <node concept="3aamgX" id="5Jw72wdrQDO" role="3acgRq">
       <property role="36QftV" value="true" />
       <ref role="30HIoZ" to="kfo3:8XWEtdX_Xs" resolve="MultiDecTab" />

From 6727af3e8eace0cf79dc45b5bdf66da3ad31b779 Mon Sep 17 00:00:00 2001
From: Alexander Rimer <rimer@itemis.de>
Date: Mon, 5 Feb 2024 08:27:20 +0100
Subject: [PATCH 10/14] expr.util: added missing impl. for TopLevelMultiDecTab

---
 .../models/behavior.mps                       | 28 +++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.util/models/behavior.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.util/models/behavior.mps
index a3f195a8ad..5cbfe14202 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.util/models/behavior.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.util/models/behavior.mps
@@ -4534,6 +4534,34 @@
       </node>
       <node concept="10P_77" id="2U$lnbPiBf3" role="3clF45" />
     </node>
+    <node concept="13i0hz" id="5gz1ElMSq$D" role="13h7CS">
+      <property role="TrG5h" value="getMembers" />
+      <ref role="13i0hy" to="pbu6:5r47dOfJ8UL" resolve="getMembers" />
+      <node concept="3Tm1VV" id="5gz1ElMSq$E" role="1B3o_S" />
+      <node concept="3clFbS" id="5gz1ElMSq$H" role="3clF47">
+        <node concept="3clFbF" id="5gz1ElMSyuH" role="3cqZAp">
+          <node concept="2OqwBi" id="5gz1ElMSyuI" role="3clFbG">
+            <node concept="2OqwBi" id="5gz1ElMSyuJ" role="2Oq$k0">
+              <node concept="2OqwBi" id="5gz1ElMSyuK" role="2Oq$k0">
+                <node concept="13iPFW" id="5gz1ElMSyuL" role="2Oq$k0" />
+                <node concept="2qgKlT" id="5gz1ElMSyuM" role="2OqNvi">
+                  <ref role="37wK5l" node="7FuUjk_57S0" resolve="resultColDefs" />
+                </node>
+              </node>
+              <node concept="v3k3i" id="5gz1ElMSyuN" role="2OqNvi">
+                <node concept="chp4Y" id="5gz1ElMSyuO" role="v3oSu">
+                  <ref role="cht4Q" to="kfo3:8XWEtdX_Yl" resolve="ResultColDef" />
+                </node>
+              </node>
+            </node>
+            <node concept="ANE8D" id="5gz1ElMSyuP" role="2OqNvi" />
+          </node>
+        </node>
+      </node>
+      <node concept="2I9FWS" id="5gz1ElMSq$I" role="3clF45">
+        <ref role="2I9WkF" to="hm2y:5r47dOfJ8UC" resolve="ITupleMemberDeclaration" />
+      </node>
+    </node>
   </node>
   <node concept="13h7C7" id="7FuUjk_57RP">
     <property role="3GE5qa" value="multidectab.expr" />

From fcbae7cb417c2f3a961f1d171f9aa0c60d6c59c3 Mon Sep 17 00:00:00 2001
From: Alexander Rimer <rimer@itemis.de>
Date: Mon, 5 Feb 2024 08:35:18 +0100
Subject: [PATCH 11/14] genjava.util: minor documentation

---
 .../org.iets3.core.expr.genjava.util@generator.mps         | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.util/generator/template/org.iets3.core.expr.genjava.util@generator.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.util/generator/template/org.iets3.core.expr.genjava.util@generator.mps
index 3e55a1c89c..291fd1cbcd 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.util/generator/template/org.iets3.core.expr.genjava.util@generator.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.util/generator/template/org.iets3.core.expr.genjava.util@generator.mps
@@ -569,6 +569,13 @@
           </node>
         </node>
       </node>
+      <node concept="2aEySx" id="5gz1ElMSzRE" role="lGtFl">
+        <node concept="19SGf9" id="5gz1ElMSzRF" role="2aEySw">
+          <node concept="19SUe$" id="5gz1ElMSzRG" role="19SJt6">
+            <property role="19SUeA" value="desugaring mandatory, because ResultColDef are not preserved during gen." />
+          </node>
+        </node>
+      </node>
     </node>
     <node concept="3aamgX" id="5Jw72wdrQDO" role="3acgRq">
       <property role="36QftV" value="true" />

From bc395c8192d4c3d1fee157d6051bd7b643e9506a Mon Sep 17 00:00:00 2001
From: Alexander Rimer <rimer@itemis.de>
Date: Mon, 5 Feb 2024 08:47:30 +0100
Subject: [PATCH 12/14] test.ts.expr.os: added TS checks for inline tuple types

---
 .../models/editor.mps                         |  49 +++++-
 .../models/test/ts/expr/os/m1@tests.mps       | 145 ++++++++++++++++++
 2 files changed, 192 insertions(+), 2 deletions(-)

diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/editor.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/editor.mps
index a19f4b8e0d..1a93d087ab 100755
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/editor.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/editor.mps
@@ -711,6 +711,9 @@
       <concept id="5232196642625574978" name="jetbrains.mps.baseLanguage.collections.structure.HeadListOperation" flags="nn" index="1eb2ty">
         <child id="5232196642625574980" name="upToIndex" index="1eb2t$" />
       </concept>
+      <concept id="1240687580870" name="jetbrains.mps.baseLanguage.collections.structure.JoinOperation" flags="nn" index="3uJxvA">
+        <child id="1240687658305" name="delimiter" index="3uJOhx" />
+      </concept>
       <concept id="1165530316231" name="jetbrains.mps.baseLanguage.collections.structure.IsEmptyOperation" flags="nn" index="1v1jN8" />
       <concept id="1202120902084" name="jetbrains.mps.baseLanguage.collections.structure.WhereOperation" flags="nn" index="3zZkjj" />
       <concept id="1202128969694" name="jetbrains.mps.baseLanguage.collections.structure.SelectOperation" flags="nn" index="3$u5V9" />
@@ -7379,8 +7382,50 @@
       <node concept="1iCGBv" id="1c6hIxySmQb" role="3EZMnx">
         <ref role="1NtTu8" to="hm2y:5r47dOfJ9kT" resolve="decl" />
         <node concept="1sVBvm" id="1c6hIxySmQe" role="1sWHZn">
-          <node concept="PMmxH" id="1c6hIxySmQA" role="2wV5jI">
-            <ref role="PMmxG" to="tpco:2wZex4PafBj" resolve="alias" />
+          <node concept="1HlG4h" id="5gz1ElMSFrN" role="2wV5jI">
+            <node concept="1HfYo3" id="5gz1ElMSFrP" role="1HlULh">
+              <node concept="3TQlhw" id="5gz1ElMSFrR" role="1Hhtcw">
+                <node concept="3clFbS" id="5gz1ElMSFrT" role="2VODD2">
+                  <node concept="3clFbF" id="5gz1ElMSFzM" role="3cqZAp">
+                    <node concept="2OqwBi" id="5gz1ElMVBr1" role="3clFbG">
+                      <node concept="2OqwBi" id="5gz1ElMVwsX" role="2Oq$k0">
+                        <node concept="2OqwBi" id="5gz1ElMSFK6" role="2Oq$k0">
+                          <node concept="pncrf" id="5gz1ElMSFzL" role="2Oq$k0" />
+                          <node concept="2qgKlT" id="5gz1ElMVuHB" role="2OqNvi">
+                            <ref role="37wK5l" to="pbu6:5r47dOfJ8UL" resolve="getMembers" />
+                          </node>
+                        </node>
+                        <node concept="3$u5V9" id="5gz1ElMVA8a" role="2OqNvi">
+                          <node concept="1bVj0M" id="5gz1ElMVA8c" role="23t8la">
+                            <node concept="3clFbS" id="5gz1ElMVA8d" role="1bW5cS">
+                              <node concept="3clFbF" id="5gz1ElMVAdO" role="3cqZAp">
+                                <node concept="2OqwBi" id="5gz1ElMVAvp" role="3clFbG">
+                                  <node concept="37vLTw" id="5gz1ElMVAdN" role="2Oq$k0">
+                                    <ref role="3cqZAo" node="5gz1ElMVA8e" resolve="it" />
+                                  </node>
+                                  <node concept="3TrcHB" id="5gz1ElMVAWE" role="2OqNvi">
+                                    <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
+                            <node concept="Rh6nW" id="5gz1ElMVA8e" role="1bW2Oz">
+                              <property role="TrG5h" value="it" />
+                              <node concept="2jxLKc" id="5gz1ElMVA8f" role="1tU5fm" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="3uJxvA" id="5gz1ElMVCGl" role="2OqNvi">
+                        <node concept="Xl_RD" id="5gz1ElMVDTe" role="3uJOhx">
+                          <property role="Xl_RC" value="_" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
           </node>
         </node>
       </node>
diff --git a/code/languages/org.iets3.opensource/tests/test.ts.expr.os/models/test/ts/expr/os/m1@tests.mps b/code/languages/org.iets3.opensource/tests/test.ts.expr.os/models/test/ts/expr/os/m1@tests.mps
index 93ebfc50c7..aa82f5aa7d 100755
--- a/code/languages/org.iets3.opensource/tests/test.ts.expr.os/models/test/ts/expr/os/m1@tests.mps
+++ b/code/languages/org.iets3.opensource/tests/test.ts.expr.os/models/test/ts/expr/os/m1@tests.mps
@@ -40,6 +40,9 @@
         <child id="8489045168660938517" name="errorRef" index="3lydEf" />
       </concept>
       <concept id="1215511704609" name="jetbrains.mps.lang.test.structure.NodeWarningCheckOperation" flags="ng" index="29bkU" />
+      <concept id="1215526290564" name="jetbrains.mps.lang.test.structure.NodeTypeCheckOperation" flags="ng" index="30Omv">
+        <child id="1215526393912" name="type" index="31d$z" />
+      </concept>
       <concept id="1215603922101" name="jetbrains.mps.lang.test.structure.NodeOperationsContainer" flags="ng" index="7CXmI">
         <child id="1215604436604" name="nodeOperations" index="7EUXB" />
       </concept>
@@ -312,6 +315,9 @@
         <child id="5115872837156576280" name="right" index="30dEs_" />
         <child id="5115872837156576278" name="left" index="30dEsF" />
       </concept>
+      <concept id="7715507625824988980" name="org.iets3.core.expr.base.structure.InlineNamedTupleAccess" flags="ng" index="383P9U">
+        <reference id="7715507625824989307" name="member" index="383OOP" />
+      </concept>
       <concept id="9142018459473556821" name="org.iets3.core.expr.base.structure.JoinType" flags="ng" index="188GKf">
         <child id="9142018459473556822" name="types" index="188GKc" />
       </concept>
@@ -327,6 +333,9 @@
       <concept id="3352322994211036342" name="org.iets3.core.expr.base.structure.OneOfTarget" flags="ng" index="1kPOiQ">
         <child id="3352322994211036351" name="values" index="1kPOiZ" />
       </concept>
+      <concept id="6252153918474458424" name="org.iets3.core.expr.base.structure.InlineTupleType" flags="ng" index="1pu8B_">
+        <reference id="6252153918474458425" name="decl" index="1pu8B$" />
+      </concept>
       <concept id="3889855429450038473" name="org.iets3.core.expr.base.structure.EmptyValue" flags="ng" index="1I1voI" />
       <concept id="3281846772293355652" name="org.iets3.core.expr.base.structure.CastExpression" flags="ng" index="1KhrV4">
         <child id="2396718651941969300" name="expr" index="12NKtY" />
@@ -17906,5 +17915,141 @@
       </node>
     </node>
   </node>
+  <node concept="1lH9Xt" id="5gz1ElMSBWl">
+    <property role="TrG5h" value="NameBasedTupleAccess" />
+    <node concept="1qefOq" id="5gz1ElMSDBM" role="1SKRRt">
+      <node concept="_iOnU" id="6HHp2WmY4bi" role="1qenE9">
+        <property role="TrG5h" value="tuples" />
+        <property role="2SXJ1i" value="true" />
+        <property role="1XBH2A" value="true" />
+        <node concept="1aga60" id="1c6hIxyYixT" role="_iOnB">
+          <property role="TrG5h" value="simpleMulteResults" />
+          <node concept="1fMURV" id="1c6hIxyYj2t" role="1ahQXP">
+            <node concept="1fLkTo" id="1c6hIxyYjeh" role="1vMDkh">
+              <node concept="1fLbrf" id="1c6hIxyYjeC" role="1fLbpX">
+                <ref role="1fLbst" node="1c6hIxyYj2u" />
+                <node concept="2vmpnb" id="1c6hIxyYjeB" role="1fLbpZ" />
+              </node>
+              <node concept="1fLbrf" id="1c6hIxyYjeR" role="1fLbpX">
+                <ref role="1fLbst" node="1c6hIxyYj2v" />
+                <node concept="30bXRB" id="1c6hIxyYjeQ" role="1fLbpZ">
+                  <property role="30bXRw" value="1" />
+                </node>
+              </node>
+              <node concept="1fLbrf" id="1c6hIxyYjfv" role="1fLbpX">
+                <ref role="1fLbst" node="1c6hIxyYj9N" resolve="r1" />
+                <node concept="2vmpnb" id="1c6hIxyYjfu" role="1fLbpZ" />
+              </node>
+              <node concept="1fLbrf" id="1c6hIxyYjfK" role="1fLbpX">
+                <ref role="1fLbst" node="1c6hIxyYjdA" resolve="r2" />
+                <node concept="30bdrP" id="1c6hIxyYjfJ" role="1fLbpZ">
+                  <property role="30bdrQ" value="done" />
+                </node>
+              </node>
+            </node>
+            <node concept="1fMUR7" id="1c6hIxyYj2u" role="1vMDcl">
+              <node concept="1afdae" id="1c6hIxyYj2O" role="1fMUOQ">
+                <ref role="1afue_" node="1c6hIxyYj13" resolve="v1" />
+              </node>
+            </node>
+            <node concept="1fMUR7" id="1c6hIxyYj2v" role="1vMDcl">
+              <node concept="1afdae" id="1c6hIxyYj6B" role="1fMUOQ">
+                <ref role="1afue_" node="1c6hIxyYj1K" resolve="v2" />
+              </node>
+            </node>
+            <node concept="1fMUOM" id="1c6hIxyYj9N" role="1vMDcl">
+              <property role="TrG5h" value="r1" />
+              <node concept="2vmvy5" id="1c6hIxyYjae" role="1fMUOZ" />
+            </node>
+            <node concept="1fMUOM" id="1c6hIxyYjdA" role="1vMDcl">
+              <property role="TrG5h" value="r2" />
+              <node concept="30bdrU" id="1c6hIxyYjdZ" role="1fMUOZ" />
+            </node>
+            <node concept="1fLkTo" id="1c6hIxyYjhi" role="1vMDkh">
+              <node concept="1fLbrf" id="1c6hIxyYjhT" role="1fLbpX">
+                <ref role="1fLbst" node="1c6hIxyYj2u" />
+                <node concept="2vmpn$" id="1c6hIxyYjhS" role="1fLbpZ" />
+              </node>
+              <node concept="1fLbrf" id="1c6hIxyYji8" role="1fLbpX">
+                <ref role="1fLbst" node="1c6hIxyYj2v" />
+                <node concept="30bXRB" id="1c6hIxyYji7" role="1fLbpZ">
+                  <property role="30bXRw" value="2" />
+                </node>
+              </node>
+              <node concept="1fLbrf" id="1c6hIxyYjiM" role="1fLbpX">
+                <ref role="1fLbst" node="1c6hIxyYj9N" resolve="r1" />
+                <node concept="2vmpn$" id="1c6hIxyYjiL" role="1fLbpZ" />
+              </node>
+              <node concept="1fLbrf" id="1c6hIxyYjj3" role="1fLbpX">
+                <ref role="1fLbst" node="1c6hIxyYjdA" resolve="r2" />
+                <node concept="30bdrP" id="1c6hIxyYjj2" role="1fLbpZ">
+                  <property role="30bdrQ" value="not done" />
+                </node>
+              </node>
+            </node>
+            <node concept="7CXmI" id="5gz1ElMSEiN" role="lGtFl">
+              <node concept="30Omv" id="5gz1ElMSEpu" role="7EUXB">
+                <node concept="1pu8B_" id="5gz1ElMYs6j" role="31d$z">
+                  <ref role="1pu8B$" node="1c6hIxyYj2t" />
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="1ahQXy" id="1c6hIxyYj13" role="1ahQWs">
+            <property role="TrG5h" value="v1" />
+            <node concept="2vmvy5" id="1c6hIxyYj1q" role="3ix9CU" />
+          </node>
+          <node concept="1ahQXy" id="1c6hIxyYj1K" role="1ahQWs">
+            <property role="TrG5h" value="v2" />
+            <node concept="30bXR$" id="1c6hIxyYj2h" role="3ix9CU" />
+          </node>
+        </node>
+        <node concept="_ixoA" id="5gz1ElMYxU5" role="_iOnB" />
+        <node concept="2zPypq" id="5gz1ElMYxXD" role="_iOnB">
+          <property role="TrG5h" value="foo" />
+          <node concept="1af_rf" id="5gz1ElMYxYw" role="2zPyp_">
+            <ref role="1afhQb" node="1c6hIxyYixT" resolve="simpleMulteResults" />
+            <node concept="2vmpnb" id="5gz1ElMYxYN" role="1afhQ5" />
+            <node concept="30bXRB" id="5gz1ElMYxZF" role="1afhQ5">
+              <property role="30bXRw" value="1" />
+            </node>
+          </node>
+        </node>
+        <node concept="2zPypq" id="5gz1ElMYy74" role="_iOnB">
+          <property role="TrG5h" value="access_r1" />
+          <node concept="1QScDb" id="5gz1ElMYy8r" role="2zPyp_">
+            <node concept="383P9U" id="5gz1ElMYybp" role="1QScD9">
+              <ref role="383OOP" node="1c6hIxyYj9N" resolve="r1" />
+            </node>
+            <node concept="_emDc" id="5gz1ElMYy7X" role="30czhm">
+              <ref role="_emDf" node="5gz1ElMYxXD" resolve="foo" />
+            </node>
+            <node concept="7CXmI" id="5gz1ElMYym5" role="lGtFl">
+              <node concept="30Omv" id="5gz1ElMYypW" role="7EUXB">
+                <node concept="2vmvy5" id="5gz1ElMYyrY" role="31d$z" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="2zPypq" id="5gz1ElMYCe_" role="_iOnB">
+          <property role="TrG5h" value="access_r2" />
+          <node concept="1QScDb" id="5gz1ElMYCeA" role="2zPyp_">
+            <node concept="383P9U" id="5gz1ElMYCiP" role="1QScD9">
+              <ref role="383OOP" node="1c6hIxyYjdA" resolve="r2" />
+            </node>
+            <node concept="_emDc" id="5gz1ElMYCeC" role="30czhm">
+              <ref role="_emDf" node="5gz1ElMYxXD" resolve="foo" />
+            </node>
+            <node concept="7CXmI" id="5gz1ElMYCeD" role="lGtFl">
+              <node concept="30Omv" id="5gz1ElMYCeE" role="7EUXB">
+                <node concept="30bdrU" id="5gz1ElMYCmA" role="31d$z" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="_ixoA" id="5gz1ElMYC6j" role="_iOnB" />
+      </node>
+    </node>
+  </node>
 </model>
 

From dd5a01c135a4748ce37ff7c45a59141442980b33 Mon Sep 17 00:00:00 2001
From: Alexander Rimer <rimer@itemis.de>
Date: Mon, 5 Feb 2024 08:57:58 +0100
Subject: [PATCH 13/14] changelog: updated

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 96242cf2b3..ad52113d23 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -19,6 +19,7 @@ The project does _not_ follow Semantic Versioning and the changes are documented
 ### Added
 
 - `NumberLiteral` can now be converted to a `BigDecimal` with the method `toBigDecimal`.
+-  Named based access of result rows of multi decision tables were added. Rows can be referenced by name and coexist with the index based access.
 
 ## December 2023
 

From b702a43e0cede41c7431d206dbc8a727bfae3f55 Mon Sep 17 00:00:00 2001
From: Alexander Rimer <rimer@itemis.de>
Date: Tue, 6 Feb 2024 14:38:54 +0100
Subject: [PATCH 14/14] Update CHANGELOG.md

changed description
---
 CHANGELOG.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ad52113d23..f6c26ed2a1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -19,7 +19,7 @@ The project does _not_ follow Semantic Versioning and the changes are documented
 ### Added
 
 - `NumberLiteral` can now be converted to a `BigDecimal` with the method `toBigDecimal`.
--  Named based access of result rows of multi decision tables were added. Rows can be referenced by name and coexist with the index based access.
+-  Named based access of result columns of multi decision tables were added. Columns can be referenced by name and coexist with the index based access.
 
 ## December 2023
 
@@ -98,4 +98,4 @@ The language extends typetags with support for different binding times of values
 
 ### Changed
 
-- `IETS3ExprEvalHelper` methods no longer log exceptions that they re-throw. Some callers may ignore exceptions thrown by the interpreter, and having them logged unnecessarily clutters the logs. It is now the caller's responsibility to log exceptions where needed.
\ No newline at end of file
+- `IETS3ExprEvalHelper` methods no longer log exceptions that they re-throw. Some callers may ignore exceptions thrown by the interpreter, and having them logged unnecessarily clutters the logs. It is now the caller's responsibility to log exceptions where needed.