From a21ebb83876d9561c56c4259a67615b193935f76 Mon Sep 17 00:00:00 2001
From: Gregory Tracy <gtracy@d-a-s.com>
Date: Fri, 12 May 2023 12:38:44 -0400
Subject: [PATCH 1/2] Allow equations in methods

---
 languages/DclareMPS/models/constraints.mps | 58 +++++++++++++++-------
 1 file changed, 39 insertions(+), 19 deletions(-)

diff --git a/languages/DclareMPS/models/constraints.mps b/languages/DclareMPS/models/constraints.mps
index adb7f937..7312440b 100644
--- a/languages/DclareMPS/models/constraints.mps
+++ b/languages/DclareMPS/models/constraints.mps
@@ -265,6 +265,7 @@
       <concept id="4693937538533521280" name="jetbrains.mps.lang.smodel.structure.OfConceptOperation" flags="ng" index="v3k3i">
         <child id="4693937538533538124" name="requestedConcept" index="v3oSu" />
       </concept>
+      <concept id="1540150895035667832" name="jetbrains.mps.lang.smodel.structure.OperationParm_SameMetaLevel" flags="ng" index="yhA9G" />
       <concept id="2396822768958367367" name="jetbrains.mps.lang.smodel.structure.AbstractTypeCastExpression" flags="nn" index="$5XWr">
         <child id="6733348108486823193" name="leftExpression" index="1m5AlR" />
         <child id="3906496115198199033" name="conceptArgument" index="3oSUPX" />
@@ -592,34 +593,53 @@
       <node concept="3clFbS" id="29R9$zYZI98" role="2VODD2">
         <node concept="3clFbF" id="29R9$zYZIgq" role="3cqZAp">
           <node concept="1eOMI4" id="2eQII2TSL4z" role="3clFbG">
-            <node concept="22lmx$" id="2eQII2TjXM8" role="1eOMHV">
-              <node concept="3y3z36" id="29R9$zYZKwq" role="3uHU7B">
-                <node concept="2OqwBi" id="29R9$zYZIgs" role="3uHU7B">
-                  <node concept="nLn13" id="29R9$zYZIgt" role="2Oq$k0" />
-                  <node concept="2Xjw5R" id="29R9$zYZIgu" role="2OqNvi">
-                    <node concept="1xMEDy" id="29R9$zYZIgv" role="1xVPHs">
-                      <node concept="chp4Y" id="29R9$$00Mh4" role="ri$Ld">
-                        <ref role="cht4Q" to="7ggn:29R9$zZUovC" resolve="Rule" />
+            <node concept="22lmx$" id="13G9peiZMDr" role="1eOMHV">
+              <node concept="22lmx$" id="2eQII2TjXM8" role="3uHU7B">
+                <node concept="2OqwBi" id="13G9peiZVZK" role="3uHU7B">
+                  <node concept="2OqwBi" id="29R9$zYZIgs" role="2Oq$k0">
+                    <node concept="nLn13" id="29R9$zYZIgt" role="2Oq$k0" />
+                    <node concept="2Xjw5R" id="13G9peiZYbQ" role="2OqNvi">
+                      <node concept="1xMEDy" id="13G9peiZYbS" role="1xVPHs">
+                        <node concept="chp4Y" id="13G9peiZYbT" role="ri$Ld">
+                          <ref role="cht4Q" to="7ggn:29R9$zZUovC" resolve="Rule" />
+                        </node>
                       </node>
+                      <node concept="1xIGOp" id="13G9peiZYbU" role="1xVPHs" />
+                      <node concept="yhA9G" id="13G9peiZYbV" role="1xVPHs" />
                     </node>
-                    <node concept="1xIGOp" id="29R9$zYZIgx" role="1xVPHs" />
                   </node>
+                  <node concept="3x8VRR" id="13G9peiZWnk" role="2OqNvi" />
+                </node>
+                <node concept="2OqwBi" id="13G9peiZX3v" role="3uHU7w">
+                  <node concept="2OqwBi" id="2eQII2TjXNx" role="2Oq$k0">
+                    <node concept="nLn13" id="2eQII2TjXNy" role="2Oq$k0" />
+                    <node concept="2Xjw5R" id="2eQII2TjXNz" role="2OqNvi">
+                      <node concept="1xMEDy" id="2eQII2TjXN$" role="1xVPHs">
+                        <node concept="chp4Y" id="2eQII2TjXN_" role="ri$Ld">
+                          <ref role="cht4Q" to="7ggn:5Hwm38JY5Mc" resolve="NativeDeclaration" />
+                        </node>
+                      </node>
+                      <node concept="1xIGOp" id="13G9peiZP17" role="1xVPHs" />
+                      <node concept="yhA9G" id="13G9peiZP8g" role="1xVPHs" />
+                    </node>
+                  </node>
+                  <node concept="3x8VRR" id="13G9peiZXqG" role="2OqNvi" />
                 </node>
-                <node concept="10Nm6u" id="29R9$zYZKGS" role="3uHU7w" />
               </node>
-              <node concept="3y3z36" id="2eQII2TjXNw" role="3uHU7w">
-                <node concept="2OqwBi" id="2eQII2TjXNx" role="3uHU7B">
-                  <node concept="nLn13" id="2eQII2TjXNy" role="2Oq$k0" />
-                  <node concept="2Xjw5R" id="2eQII2TjXNz" role="2OqNvi">
-                    <node concept="1xMEDy" id="2eQII2TjXN$" role="1xVPHs">
-                      <node concept="chp4Y" id="2eQII2TjXN_" role="ri$Ld">
-                        <ref role="cht4Q" to="7ggn:5Hwm38JY5Mc" resolve="NativeDeclaration" />
+              <node concept="2OqwBi" id="13G9peiZRGX" role="3uHU7w">
+                <node concept="2OqwBi" id="13G9peiZMUR" role="2Oq$k0">
+                  <node concept="nLn13" id="13G9peiZMKH" role="2Oq$k0" />
+                  <node concept="2Xjw5R" id="13G9peiZNpJ" role="2OqNvi">
+                    <node concept="1xMEDy" id="13G9peiZNpL" role="1xVPHs">
+                      <node concept="chp4Y" id="13G9peiZNKe" role="ri$Ld">
+                        <ref role="cht4Q" to="7ggn:3$OkZkHRDLt" resolve="Method" />
                       </node>
                     </node>
-                    <node concept="1xIGOp" id="2eQII2TjXNA" role="1xVPHs" />
+                    <node concept="1xIGOp" id="13G9peiZOGJ" role="1xVPHs" />
+                    <node concept="yhA9G" id="13G9peiZONz" role="1xVPHs" />
                   </node>
                 </node>
-                <node concept="10Nm6u" id="2eQII2TjXNB" role="3uHU7w" />
+                <node concept="3x8VRR" id="13G9peiZT3$" role="2OqNvi" />
               </node>
             </node>
           </node>

From 73fa2badfbab75e9b163713e5e20ce2b79dc5387 Mon Sep 17 00:00:00 2001
From: Gregory Tracy <gtracy@d-a-s.com>
Date: Fri, 12 May 2023 12:58:46 -0400
Subject: [PATCH 2/2] Respect meta-level

---
 languages/DclareMPS/models/behavior.mps    |  2 +
 languages/DclareMPS/models/constraints.mps | 59 +++++++++++++---------
 languages/DclareMPS/models/typesystem.mps  |  5 ++
 3 files changed, 41 insertions(+), 25 deletions(-)

diff --git a/languages/DclareMPS/models/behavior.mps b/languages/DclareMPS/models/behavior.mps
index e4a5b591..1e230045 100644
--- a/languages/DclareMPS/models/behavior.mps
+++ b/languages/DclareMPS/models/behavior.mps
@@ -355,6 +355,7 @@
       <concept id="4693937538533521280" name="jetbrains.mps.lang.smodel.structure.OfConceptOperation" flags="ng" index="v3k3i">
         <child id="4693937538533538124" name="requestedConcept" index="v3oSu" />
       </concept>
+      <concept id="1540150895035667832" name="jetbrains.mps.lang.smodel.structure.OperationParm_SameMetaLevel" flags="ng" index="yhA9G" />
       <concept id="7453996997717780434" name="jetbrains.mps.lang.smodel.structure.Node_GetSConceptOperation" flags="nn" index="2yIwOk" />
       <concept id="1173122760281" name="jetbrains.mps.lang.smodel.structure.Node_GetAncestorsOperation" flags="nn" index="z$bX8" />
       <concept id="2396822768958367367" name="jetbrains.mps.lang.smodel.structure.AbstractTypeCastExpression" flags="nn" index="$5XWr">
@@ -13745,6 +13746,7 @@
                   </node>
                 </node>
                 <node concept="1xIGOp" id="64dupBntyXA" role="1xVPHs" />
+                <node concept="yhA9G" id="13G9pej_N77" role="1xVPHs" />
               </node>
             </node>
           </node>
diff --git a/languages/DclareMPS/models/constraints.mps b/languages/DclareMPS/models/constraints.mps
index 7312440b..58b2bfc2 100644
--- a/languages/DclareMPS/models/constraints.mps
+++ b/languages/DclareMPS/models/constraints.mps
@@ -415,6 +415,7 @@
                   </node>
                 </node>
                 <node concept="1xIGOp" id="147CB3QsVd6" role="1xVPHs" />
+                <node concept="yhA9G" id="13G9pej01gD" role="1xVPHs" />
               </node>
             </node>
           </node>
@@ -1452,6 +1453,7 @@
                     </node>
                   </node>
                   <node concept="1xIGOp" id="64dupBnsVjs" role="1xVPHs" />
+                  <node concept="yhA9G" id="13G9pejuhlu" role="1xVPHs" />
                 </node>
               </node>
             </node>
@@ -1551,6 +1553,7 @@
                   </node>
                 </node>
                 <node concept="1xIGOp" id="4wbMdoKd95G" role="1xVPHs" />
+                <node concept="yhA9G" id="13G9pejzbhK" role="1xVPHs" />
               </node>
             </node>
           </node>
@@ -2667,6 +2670,7 @@
                   </node>
                 </node>
                 <node concept="1xIGOp" id="3HLMRNkv2B3" role="1xVPHs" />
+                <node concept="yhA9G" id="13G9pej00Nj" role="1xVPHs" />
               </node>
             </node>
           </node>
@@ -3370,6 +3374,7 @@
                   </node>
                 </node>
                 <node concept="1xIGOp" id="7x27w4ybGSD" role="1xVPHs" />
+                <node concept="yhA9G" id="13G9pejzf7N" role="1xVPHs" />
               </node>
             </node>
           </node>
@@ -4390,6 +4395,7 @@
                     </node>
                   </node>
                   <node concept="1xIGOp" id="64dupBnt9d$" role="1xVPHs" />
+                  <node concept="yhA9G" id="13G9pejvlD5" role="1xVPHs" />
                 </node>
               </node>
             </node>
@@ -4642,6 +4648,7 @@
                         </node>
                       </node>
                       <node concept="1xIGOp" id="5KrXDVZCE_z" role="1xVPHs" />
+                      <node concept="yhA9G" id="13G9pej04c6" role="1xVPHs" />
                     </node>
                   </node>
                   <node concept="10Nm6u" id="5KrXDVZCE_t" role="3uHU7w" />
@@ -4656,6 +4663,7 @@
                         </node>
                       </node>
                       <node concept="1xIGOp" id="5KrXDVZCHV4" role="1xVPHs" />
+                      <node concept="yhA9G" id="13G9pej04jH" role="1xVPHs" />
                     </node>
                   </node>
                   <node concept="10Nm6u" id="5KrXDVZCHV5" role="3uHU7w" />
@@ -4673,6 +4681,7 @@
                     </node>
                   </node>
                   <node concept="1xIGOp" id="5KrXDVZCKoM" role="1xVPHs" />
+                  <node concept="yhA9G" id="13G9pej04vk" role="1xVPHs" />
                 </node>
               </node>
             </node>
@@ -4698,6 +4707,7 @@
                   </node>
                 </node>
                 <node concept="1xIGOp" id="4y4FX$OmRqN" role="1xVPHs" />
+                <node concept="yhA9G" id="13G9pej00Cq" role="1xVPHs" />
               </node>
             </node>
           </node>
@@ -4722,6 +4732,7 @@
                   </node>
                 </node>
                 <node concept="1xIGOp" id="5OdjRtQDUdy" role="1xVPHs" />
+                <node concept="yhA9G" id="13G9pejzm$j" role="1xVPHs" />
               </node>
             </node>
           </node>
@@ -4769,6 +4780,7 @@
                     </node>
                   </node>
                   <node concept="1xIGOp" id="OIpsC9Ue6f" role="1xVPHs" />
+                  <node concept="yhA9G" id="13G9pejvoc4" role="1xVPHs" />
                 </node>
               </node>
             </node>
@@ -4836,6 +4848,7 @@
                                       <ref role="cht4Q" to="7ggn:4WFClUM1rSw" resolve="Feature" />
                                     </node>
                                   </node>
+                                  <node concept="yhA9G" id="13G9pejvosV" role="1xVPHs" />
                                 </node>
                               </node>
                             </node>
@@ -5308,6 +5321,7 @@
                   </node>
                 </node>
                 <node concept="1xIGOp" id="2keqoSPaqlO" role="1xVPHs" />
+                <node concept="yhA9G" id="13G9pej04Fv" role="1xVPHs" />
               </node>
             </node>
           </node>
@@ -5332,6 +5346,7 @@
                   </node>
                 </node>
                 <node concept="1xIGOp" id="3ANOQoW2ust" role="1xVPHs" />
+                <node concept="yhA9G" id="13G9pejzjsp" role="1xVPHs" />
               </node>
             </node>
           </node>
@@ -5356,6 +5371,7 @@
                   </node>
                 </node>
                 <node concept="1xIGOp" id="3ANOQoW2uUR" role="1xVPHs" />
+                <node concept="yhA9G" id="13G9pejzjAa" role="1xVPHs" />
               </node>
             </node>
           </node>
@@ -5380,6 +5396,7 @@
                     </node>
                   </node>
                   <node concept="1xIGOp" id="3ANOQoW2v1i" role="1xVPHs" />
+                  <node concept="yhA9G" id="13G9pejzjch" role="1xVPHs" />
                 </node>
               </node>
               <node concept="10Nm6u" id="3ANOQoW2v1c" role="3uHU7w" />
@@ -5394,6 +5411,7 @@
                     </node>
                   </node>
                   <node concept="1xIGOp" id="3ANOQoW2vwI" role="1xVPHs" />
+                  <node concept="yhA9G" id="13G9pejzjib" role="1xVPHs" />
                 </node>
               </node>
               <node concept="10Nm6u" id="3ANOQoW2vwC" role="3uHU7w" />
@@ -5580,6 +5598,7 @@
                   </node>
                 </node>
                 <node concept="1xIGOp" id="6iP0$0M8igc" role="1xVPHs" />
+                <node concept="yhA9G" id="13G9pejzi5v" role="1xVPHs" />
               </node>
             </node>
           </node>
@@ -5599,6 +5618,7 @@
                   </node>
                 </node>
                 <node concept="1xIGOp" id="6iP0$0M8igl" role="1xVPHs" />
+                <node concept="yhA9G" id="13G9pejzi8s" role="1xVPHs" />
               </node>
             </node>
           </node>
@@ -5656,6 +5676,7 @@
                     </node>
                   </node>
                   <node concept="1xIGOp" id="3ANOQoW2zLq" role="1xVPHs" />
+                  <node concept="yhA9G" id="13G9pejvn6d" role="1xVPHs" />
                 </node>
               </node>
             </node>
@@ -5777,6 +5798,7 @@
                   </node>
                 </node>
                 <node concept="1xIGOp" id="6iP0$0M8gLA" role="1xVPHs" />
+                <node concept="yhA9G" id="13G9pejvmWZ" role="1xVPHs" />
               </node>
             </node>
           </node>
@@ -5796,6 +5818,7 @@
                   </node>
                 </node>
                 <node concept="1xIGOp" id="6iP0$0M8h1v" role="1xVPHs" />
+                <node concept="yhA9G" id="13G9pejvmZW" role="1xVPHs" />
               </node>
             </node>
           </node>
@@ -5929,35 +5952,20 @@
     <node concept="9S07l" id="71LbkF4S60O" role="9Vyp8">
       <node concept="3clFbS" id="71LbkF4S60P" role="2VODD2">
         <node concept="3clFbF" id="71LbkF4S64N" role="3cqZAp">
-          <node concept="1Wc70l" id="71LbkF4S64O" role="3clFbG">
-            <node concept="3y3z36" id="71LbkF4S64P" role="3uHU7B">
-              <node concept="2OqwBi" id="71LbkF4S64Q" role="3uHU7B">
-                <node concept="nLn13" id="71LbkF4S64R" role="2Oq$k0" />
-                <node concept="2Xjw5R" id="71LbkF4S64S" role="2OqNvi">
-                  <node concept="1xMEDy" id="71LbkF4S64T" role="1xVPHs">
-                    <node concept="chp4Y" id="71LbkF4S64U" role="ri$Ld">
-                      <ref role="cht4Q" to="7ggn:5Hwm38JY5Mc" resolve="NativeDeclaration" />
-                    </node>
-                  </node>
-                  <node concept="1xIGOp" id="71LbkF4S64V" role="1xVPHs" />
-                </node>
-              </node>
-              <node concept="10Nm6u" id="71LbkF4S64W" role="3uHU7w" />
-            </node>
-            <node concept="3clFbC" id="71LbkF4S64X" role="3uHU7w">
-              <node concept="2OqwBi" id="71LbkF4S64Y" role="3uHU7B">
-                <node concept="nLn13" id="71LbkF4S64Z" role="2Oq$k0" />
-                <node concept="2Xjw5R" id="71LbkF4S650" role="2OqNvi">
-                  <node concept="1xMEDy" id="71LbkF4S651" role="1xVPHs">
-                    <node concept="chp4Y" id="71LbkF4S652" role="ri$Ld">
-                      <ref role="cht4Q" to="7ggn:5Hwm38JY5Md" resolve="NativeAttributeHandler" />
-                    </node>
+          <node concept="3y3z36" id="71LbkF4S64P" role="3clFbG">
+            <node concept="2OqwBi" id="71LbkF4S64Q" role="3uHU7B">
+              <node concept="nLn13" id="71LbkF4S64R" role="2Oq$k0" />
+              <node concept="2Xjw5R" id="71LbkF4S64S" role="2OqNvi">
+                <node concept="1xMEDy" id="71LbkF4S64T" role="1xVPHs">
+                  <node concept="chp4Y" id="71LbkF4S64U" role="ri$Ld">
+                    <ref role="cht4Q" to="7ggn:5Hwm38JY5Mc" resolve="NativeDeclaration" />
                   </node>
-                  <node concept="1xIGOp" id="71LbkF4S653" role="1xVPHs" />
                 </node>
+                <node concept="1xIGOp" id="71LbkF4S64V" role="1xVPHs" />
+                <node concept="yhA9G" id="13G9pej3kPI" role="1xVPHs" />
               </node>
-              <node concept="10Nm6u" id="71LbkF4S654" role="3uHU7w" />
             </node>
+            <node concept="10Nm6u" id="71LbkF4S64W" role="3uHU7w" />
           </node>
         </node>
       </node>
@@ -5985,6 +5993,7 @@
                     </node>
                   </node>
                   <node concept="1xIGOp" id="5x0Fo$W55hE" role="1xVPHs" />
+                  <node concept="yhA9G" id="13G9pejvm2v" role="1xVPHs" />
                 </node>
               </node>
             </node>
diff --git a/languages/DclareMPS/models/typesystem.mps b/languages/DclareMPS/models/typesystem.mps
index 138b8996..b2ca4492 100644
--- a/languages/DclareMPS/models/typesystem.mps
+++ b/languages/DclareMPS/models/typesystem.mps
@@ -304,6 +304,7 @@
       <concept id="4693937538533521280" name="jetbrains.mps.lang.smodel.structure.OfConceptOperation" flags="ng" index="v3k3i">
         <child id="4693937538533538124" name="requestedConcept" index="v3oSu" />
       </concept>
+      <concept id="1540150895035667832" name="jetbrains.mps.lang.smodel.structure.OperationParm_SameMetaLevel" flags="ng" index="yhA9G" />
       <concept id="7453996997717780434" name="jetbrains.mps.lang.smodel.structure.Node_GetSConceptOperation" flags="nn" index="2yIwOk" />
       <concept id="2396822768958367367" name="jetbrains.mps.lang.smodel.structure.AbstractTypeCastExpression" flags="nn" index="$5XWr">
         <child id="6733348108486823193" name="leftExpression" index="1m5AlR" />
@@ -489,6 +490,7 @@
                     <ref role="cht4Q" to="7ggn:61p65V8x$6I" resolve="ThisContext" />
                   </node>
                 </node>
+                <node concept="yhA9G" id="13G9pej01BY" role="1xVPHs" />
               </node>
             </node>
             <node concept="2qgKlT" id="jVwYUSRmqo" role="2OqNvi">
@@ -1415,6 +1417,7 @@
                   </node>
                 </node>
                 <node concept="1xIGOp" id="4wbMdoKda0H" role="1xVPHs" />
+                <node concept="yhA9G" id="13G9pejvpaf" role="1xVPHs" />
               </node>
             </node>
             <node concept="2qgKlT" id="4$bpWrPpeUI" role="2OqNvi">
@@ -6382,6 +6385,7 @@
                   </node>
                 </node>
                 <node concept="1xIGOp" id="52x11UPju7_" role="1xVPHs" />
+                <node concept="yhA9G" id="13G9pejvqQ3" role="1xVPHs" />
               </node>
             </node>
             <node concept="2qgKlT" id="52x11UPju7A" role="2OqNvi">
@@ -7059,6 +7063,7 @@
                     <ref role="cht4Q" to="7ggn:61p65V8x$6I" resolve="ThisContext" />
                   </node>
                 </node>
+                <node concept="yhA9G" id="13G9pejvtqq" role="1xVPHs" />
               </node>
             </node>
             <node concept="2qgKlT" id="7LXUKct4swU" role="2OqNvi">