Merge pull request #921 from IETS3/merge/mps20213

Merge maintenance/mps20213 into maintenance/mps20222
IETS3 · Apr 19, 2024 · 3ceb346 · 3ceb346
2 parents e846015 + 6874beb
commit 3ceb346
Show file tree

Hide file tree

Showing 6 changed files with 142 additions and 11 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -11,6 +11,10 @@ The project does _not_ follow Semantic Versioning and the changes are documented
 
 - The unnecessary super types of the tuple type were removed and are not necessary anymore.
 
+### Fixed
+
+- Enum literals now can be compared for equality in the generator.
+
 ### Changed
 
 - `ComponentKind#canbeContent(conceptNode<>)` was deprecated in favour of `ComponentKind#canbeContent(concept<>)` 

diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.tests/models/behavior.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.tests/models/behavior.mps
@@ -9654,9 +9654,9 @@
     <property role="3GE5qa" value="vector" />
     <ref role="13h7C2" to="av4b:1bwJEEfQxC8" resolve="TestSubjectAdapter" />
     <node concept="13i0hz" id="1bwJEEeSLhl" role="13h7CS">
-      <property role="13i0iv" value="true" />
       <property role="13i0it" value="true" />
       <property role="TrG5h" value="arguments" />
+      <property role="13i0iv" value="true" />
       <node concept="3Tm1VV" id="1bwJEEeSLhm" role="1B3o_S" />
       <node concept="2I9FWS" id="1bwJEEeSUiU" role="3clF45">
         <ref role="2I9WkF" to="tpck:h0TrEE$" resolve="INamedConcept" />
@@ -10373,15 +10373,14 @@
               <node concept="3cpWsn" id="1vJWYavhKZL" role="3cpWs9">
                 <property role="TrG5h" value="matches" />
                 <node concept="10P_77" id="1vJWYavhKZA" role="1tU5fm" />
-                <node concept="2OqwBi" id="1vJWYavhKZM" role="33vP2m">
-                  <node concept="37vLTw" id="1vJWYavhKZN" role="2Oq$k0">
+                <node concept="2YIFZM" id="5k9pVzGTXKW" role="33vP2m">
+                  <ref role="37wK5l" to="dj6k:1EZBwZ4muLD" resolve="equals" />
+                  <ref role="1Pybhc" to="dj6k:1EZBwZ4mn8E" resolve="EqualsHelper" />
+                  <node concept="37vLTw" id="5k9pVzGTYtJ" role="37wK5m">
                     <ref role="3cqZAo" node="1vJWYavhGRk" resolve="expValue" />
                   </node>
-                  <node concept="liA8E" id="1vJWYavhKZO" role="2OqNvi">
-                    <ref role="37wK5l" to="wyt6:~Object.equals(java.lang.Object)" resolve="equals" />
-                    <node concept="37vLTw" id="1vJWYavhKZP" role="37wK5m">
-                      <ref role="3cqZAo" node="4945UtSiwdl" resolve="actualVal" />
-                    </node>
+                  <node concept="37vLTw" id="5k9pVzGTZTr" role="37wK5m">
+                    <ref role="3cqZAo" node="4945UtSiwdl" resolve="actualVal" />
                   </node>
                 </node>
               </node>

diff --git a/...languages/org.iets3.opensource/languages/org.iets3.core.expr.tests/models/constraints.mps b/...languages/org.iets3.opensource/languages/org.iets3.core.expr.tests/models/constraints.mps
@@ -77,6 +77,7 @@
       <concept id="5564765827938091039" name="jetbrains.mps.lang.constraints.structure.ConstraintFunction_ReferentSearchScope_Scope" flags="ig" index="3dgokm" />
       <concept id="1213093968558" name="jetbrains.mps.lang.constraints.structure.ConceptConstraints" flags="ng" index="1M2fIO">
         <reference id="1213093996982" name="concept" index="1M2myG" />
+        <reference id="1213106917431" name="defaultConcreteConcept" index="1MND4H" />
         <child id="6702802731807737306" name="canBeChild" index="9Vyp8" />
         <child id="1213100494875" name="referent" index="1Mr941" />
       </concept>
@@ -569,5 +570,10 @@
       </node>
     </node>
   </node>
+  <node concept="1M2fIO" id="3CYAe9brSef">
+    <property role="3GE5qa" value="vector" />
+    <ref role="1M2myG" to="av4b:1bwJEEfQxC8" resolve="TestSubjectAdapter" />
+    <ref role="1MND4H" to="av4b:1bwJEEfQxDh" resolve="FunctionSubjectAdapter" />
+  </node>
 </model>
 
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.tests/models/editor.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.tests/models/editor.mps
@@ -4092,9 +4092,30 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="3y3z36" id="1bwJEEgmFqd" role="3clFbw">
-                          <node concept="10Nm6u" id="1bwJEEgmFqe" role="3uHU7w" />
-                          <node concept="3oseBL" id="1bwJEEgmFqf" role="3uHU7B" />
+                        <node concept="1Wc70l" id="2tfhTxhr2Nc" role="3clFbw">
+                          <node concept="3y3z36" id="1bwJEEgmFqd" role="3uHU7B">
+                            <node concept="3oseBL" id="1bwJEEgmFqf" role="3uHU7B" />
+                            <node concept="10Nm6u" id="1bwJEEgmFqe" role="3uHU7w" />
+                          </node>
+                          <node concept="3y3z36" id="2tfhTxhr4yQ" role="3uHU7w">
+                            <node concept="10Nm6u" id="2tfhTxhr5gq" role="3uHU7w" />
+                            <node concept="2OqwBi" id="2tfhTxhr3tw" role="3uHU7B">
+                              <node concept="37vLTw" id="2tfhTxhr3tx" role="2Oq$k0">
+                                <ref role="3cqZAo" node="1bwJEEgpHKW" resolve="outputs" />
+                              </node>
+                              <node concept="34jXtK" id="2tfhTxhr3ty" role="2OqNvi">
+                                <node concept="3cpWsd" id="2tfhTxhr3tz" role="25WWJ7">
+                                  <node concept="2rSBBp" id="2tfhTxhr3t$" role="3uHU7B" />
+                                  <node concept="2OqwBi" id="2tfhTxhr3t_" role="3uHU7w">
+                                    <node concept="37vLTw" id="2tfhTxhr3tA" role="2Oq$k0">
+                                      <ref role="3cqZAo" node="1bwJEEgl6vN" resolve="args" />
+                                    </node>
+                                    <node concept="34oBXx" id="2tfhTxhr3tB" role="2OqNvi" />
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
+                          </node>
                         </node>
                       </node>
                     </node>

diff --git a/...rce/languages/org.iets3.core.expr.toplevel/models/org/iets3/core/expr/toplevel/plugin.mps b/...rce/languages/org.iets3.core.expr.toplevel/models/org/iets3/core/expr/toplevel/plugin.mps
@@ -121,6 +121,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>
@@ -2675,6 +2676,72 @@
         <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
       </node>
     </node>
+    <node concept="2tJIrI" id="5k9pVzGS$yU" role="jymVt" />
+    <node concept="3clFb_" id="5k9pVzGSGdk" role="jymVt">
+      <property role="TrG5h" value="equals" />
+      <node concept="3Tm1VV" id="5k9pVzGSGdl" role="1B3o_S" />
+      <node concept="10P_77" id="5k9pVzGSGdn" role="3clF45" />
+      <node concept="37vLTG" id="5k9pVzGSGdo" role="3clF46">
+        <property role="TrG5h" value="other" />
+        <node concept="3uibUv" id="5k9pVzGSGdp" role="1tU5fm">
+          <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
+        </node>
+      </node>
+      <node concept="3clFbS" id="5k9pVzGSGdq" role="3clF47">
+        <node concept="3clFbJ" id="5k9pVzGSNcE" role="3cqZAp">
+          <node concept="3clFbS" id="5k9pVzGSNcG" role="3clFbx">
+            <node concept="3cpWs8" id="7uVkjvZN0zN" role="3cqZAp">
+              <node concept="3cpWsn" id="7uVkjvZN0zO" role="3cpWs9">
+                <property role="TrG5h" value="literal" />
+                <node concept="3uibUv" id="7uVkjvZMZcR" role="1tU5fm">
+                  <ref role="3uigEE" node="365yA_OO5FT" resolve="EnumLiteral" />
+                </node>
+                <node concept="10QFUN" id="7uVkjvZN0zP" role="33vP2m">
+                  <node concept="3uibUv" id="7uVkjvZN0zQ" role="10QFUM">
+                    <ref role="3uigEE" node="365yA_OO5FT" resolve="EnumLiteral" />
+                  </node>
+                  <node concept="37vLTw" id="7uVkjvZN0zR" role="10QFUP">
+                    <ref role="3cqZAo" node="5k9pVzGSGdo" resolve="other" />
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3cpWs6" id="7uVkjvZQs4Z" role="3cqZAp">
+              <node concept="17R0WA" id="7uVkjvZRg5$" role="3cqZAk">
+                <node concept="2OqwBi" id="7uVkjvZRjch" role="3uHU7w">
+                  <node concept="Xjq3P" id="7uVkjvZRia3" role="2Oq$k0" />
+                  <node concept="2OwXpG" id="7uVkjvZRlf3" role="2OqNvi">
+                    <ref role="2Oxat5" node="365yA_OOfZ6" resolve="literal" />
+                  </node>
+                </node>
+                <node concept="2OqwBi" id="7uVkjvZQWUd" role="3uHU7B">
+                  <node concept="37vLTw" id="7uVkjvZR3Di" role="2Oq$k0">
+                    <ref role="3cqZAo" node="7uVkjvZN0zO" resolve="literal" />
+                  </node>
+                  <node concept="2OwXpG" id="7uVkjvZR5G7" role="2OqNvi">
+                    <ref role="2Oxat5" node="365yA_OOfZ6" resolve="literal" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="2ZW3vV" id="5k9pVzGSQci" role="3clFbw">
+            <node concept="3uibUv" id="5k9pVzGSREZ" role="2ZW6by">
+              <ref role="3uigEE" node="365yA_OO5FT" resolve="EnumLiteral" />
+            </node>
+            <node concept="37vLTw" id="5k9pVzGSOBv" role="2ZW6bz">
+              <ref role="3cqZAo" node="5k9pVzGSGdo" resolve="other" />
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs6" id="7LJfRMDRrea" role="3cqZAp">
+          <node concept="3clFbT" id="7LJfRMDRrKp" role="3cqZAk" />
+        </node>
+      </node>
+      <node concept="2AHcQZ" id="5k9pVzGSGdr" role="2AJF6D">
+        <ref role="2AI5Lk" to="wyt6:~Override" />
+      </node>
+    </node>
   </node>
 </model>
 
diff --git a/.../languages/org.iets3.opensource/tests/test.ts.expr.os/models/test/ts/expr/os/m1@tests.mps b/.../languages/org.iets3.opensource/tests/test.ts.expr.os/models/test/ts/expr/os/m1@tests.mps
@@ -412,10 +412,14 @@
       </concept>
       <concept id="1360296727231624741" name="org.iets3.core.expr.tests.structure.InvalidInputOutcome" flags="ng" index="2t9cyf" />
       <concept id="1360296727231624728" name="org.iets3.core.expr.tests.structure.ValidOutcome" flags="ng" index="2t9cyM" />
+      <concept id="1360296727233042952" name="org.iets3.core.expr.tests.structure.TestSubjectAdapter" flags="ng" index="2teEiy">
+        <property id="4134712908316713399" name="internalUniqueID" index="3X4tbc" />
+      </concept>
       <concept id="1360296727233043025" name="org.iets3.core.expr.tests.structure.FunctionSubjectAdapter" flags="ng" index="2teEjV">
         <property id="1360296727242672265" name="checkResults" index="22zroz" />
         <reference id="1360296727233043038" name="fun" index="2teEjO" />
       </concept>
+      <concept id="1360296727229780144" name="org.iets3.core.expr.tests.structure.EmptyProducer" flags="ng" index="2tieSq" />
       <concept id="1360296727219460885" name="org.iets3.core.expr.tests.structure.InputValue" flags="ng" index="2tUAmZ">
         <reference id="1360296727219460916" name="argument" index="2tUAmu" />
         <child id="1360296727219460918" name="value" index="2tUAms" />
@@ -16724,6 +16728,36 @@
         </node>
       </node>
     </node>
+    <node concept="_ixoA" id="5k9pVzGXTEi" role="_iOnB" />
+    <node concept="1aga60" id="5k9pVzGXW6D" role="_iOnB">
+      <property role="TrG5h" value="f" />
+      <node concept="5mhuz" id="5k9pVzGXY48" role="1ahQXP">
+        <ref role="5mhpJ" node="1bwJEEguiBh" resolve="RED" />
+      </node>
+    </node>
+    <node concept="_ixoA" id="5k9pVzGXY4i" role="_iOnB" />
+    <node concept="_fkuM" id="5k9pVzGY0wP" role="_iOnB">
+      <property role="TrG5h" value="enumEquality" />
+      <node concept="1jlL7U" id="3CYAe9brZo9" role="_fkp5">
+        <node concept="2teEjV" id="3CYAe9brZoa" role="1jbP1Y">
+          <property role="3X4tbc" value="1712644506027/apann" />
+          <property role="22zroz" value="true" />
+          <ref role="2teEjO" node="5k9pVzGXW6D" resolve="f" />
+        </node>
+        <node concept="1jlL7l" id="3CYAe9brZob" role="1jlL6c">
+          <node concept="2tieSq" id="3CYAe9brZoj" role="2tibTm" />
+          <node concept="2s0UEP" id="3CYAe9brZo$" role="2s0UE9">
+            <node concept="2t9cyM" id="3CYAe9brZo_" role="2t9cyo" />
+            <node concept="22E7GR" id="3CYAe9brZoM" role="22EBs4">
+              <ref role="22x4DC" node="5k9pVzGXW6D" resolve="f" />
+              <node concept="5mhuz" id="3CYAe9brZoL" role="22E7H2">
+                <ref role="5mhpJ" node="1bwJEEguiBh" resolve="RED" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
   </node>
   <node concept="_iOnU" id="2S3ZC$oC8Qh">
     <property role="TrG5h" value="typedefs" />