Merge pull request #927 from IETS3/bugfix/makeJoinSlicesNullAware_20213

temporal.runtime: TemporalOps.joinSlices can now handle null values of slices
IETS3 · Apr 23, 2024 · e8b539b · e8b539b
2 parents ad5c29f + 584c7de
commit e8b539b
Show file tree

Hide file tree

Showing 7 changed files with 862 additions and 134 deletions.
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.base/org.iets3.core.base.mpl b/code/languages/org.iets3.opensource/languages/org.iets3.core.base/org.iets3.core.base.mpl
@@ -16,7 +16,7 @@
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
     <dependency reexport="false">1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor)</dependency>
     <dependency reexport="false">ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)</dependency>
-    <dependency reexport="false">5454dbfd-2075-4de0-b85e-fa645eb6957e(com.mbeddr.mpsutil.serializer.xml)</dependency>
+    <dependency reexport="false">5454dbfd-2075-4de0-b85e-fa645eb6957e(de.itemis.mps.utils.serializer.xml)</dependency>
     <dependency reexport="false">f0fff802-6d26-4d2e-b89d-391357265626(de.slisson.mps.hacks.editor)</dependency>
   </dependencies>
   <languageVersions>
@@ -72,10 +72,10 @@
     <module reference="d3a0fd26-445a-466c-900e-10444ddfed52(com.mbeddr.mpsutil.filepicker)" version="0" />
     <module reference="d09a16fb-1d68-4a92-a5a4-20b4b2f86a62(com.mbeddr.mpsutil.jung)" version="0" />
     <module reference="b4d28e19-7d2d-47e9-943e-3a41f97a0e52(com.mbeddr.mpsutil.plantuml.node)" version="0" />
-    <module reference="5454dbfd-2075-4de0-b85e-fa645eb6957e(com.mbeddr.mpsutil.serializer.xml)" version="0" />
     <module reference="848ef45d-e560-4e35-853c-f35a64cc135c(de.itemis.mps.editor.celllayout.runtime)" version="0" />
     <module reference="24c96a96-b7a1-4f30-82da-0f8e279a2661(de.itemis.mps.editor.celllayout.styles)" version="0" />
     <module reference="cce85e64-7b37-4ad5-b0e6-9d18324cdfb3(de.itemis.mps.selection.runtime)" version="0" />
+    <module reference="5454dbfd-2075-4de0-b85e-fa645eb6957e(de.itemis.mps.utils.serializer.xml)" version="0" />
     <module reference="dc038ceb-b7ea-4fea-ac12-55f7400e97ba(de.slisson.mps.editor.multiline.runtime)" version="0" />
     <module reference="f0fff802-6d26-4d2e-b89d-391357265626(de.slisson.mps.hacks.editor)" version="0" />
     <module reference="92d2ea16-5a42-4fdf-a676-c7604efe3504(de.slisson.mps.richtext)" version="0" />

diff --git a/...pr.genjava.temporal/generator/template/org.iets3.core.expr.genjava.temporal@generator.mps b/...pr.genjava.temporal/generator/template/org.iets3.core.expr.genjava.temporal@generator.mps
@@ -3870,8 +3870,9 @@
                       <ref role="37wK5l" to="8rdi:4voqclTDifZ" resolve="slices" />
                     </node>
                   </node>
-                  <node concept="TSZUe" id="2T4w_AkFNuJ" role="2OqNvi">
-                    <node concept="2ShNRf" id="2T4w_AkFNxb" role="25WWJ7">
+                  <node concept="liA8E" id="475Xz0y11E0" role="2OqNvi">
+                    <ref role="37wK5l" to="8rdi:475Xz0wPGET" resolve="add" />
+                    <node concept="2ShNRf" id="2T4w_AkFNxb" role="37wK5m">
                       <node concept="1pGfFk" id="2T4w_AkFNFY" role="2ShVmc">
                         <ref role="37wK5l" to="8rdi:50smQ1VbaTB" resolve="SliceValue" />
                         <node concept="37vLTw" id="2T4w_AkFNIu" role="37wK5m">
@@ -5399,7 +5400,7 @@
                         </node>
                       </node>
                       <node concept="liA8E" id="2Wqs7Xm9jBR" role="2OqNvi">
-                        <ref role="37wK5l" to="33ny:~List.isEmpty()" resolve="isEmpty" />
+                        <ref role="37wK5l" to="33ny:~ArrayList.isEmpty()" resolve="isEmpty" />
                       </node>
                     </node>
                   </node>
@@ -5832,7 +5833,7 @@
                         </node>
                       </node>
                       <node concept="liA8E" id="2Wqs7XmaqtK" role="2OqNvi">
-                        <ref role="37wK5l" to="33ny:~List.isEmpty()" resolve="isEmpty" />
+                        <ref role="37wK5l" to="33ny:~ArrayList.isEmpty()" resolve="isEmpty" />
                       </node>
                     </node>
                   </node>
@@ -6264,7 +6265,7 @@
                         </node>
                       </node>
                       <node concept="liA8E" id="2Wqs7XmarJ1" role="2OqNvi">
-                        <ref role="37wK5l" to="33ny:~List.isEmpty()" resolve="isEmpty" />
+                        <ref role="37wK5l" to="33ny:~ArrayList.isEmpty()" resolve="isEmpty" />
                       </node>
                     </node>
                   </node>
@@ -6838,7 +6839,7 @@
                         </node>
                       </node>
                       <node concept="liA8E" id="2Wqs7XmasQq" role="2OqNvi">
-                        <ref role="37wK5l" to="33ny:~List.isEmpty()" resolve="isEmpty" />
+                        <ref role="37wK5l" to="33ny:~ArrayList.isEmpty()" resolve="isEmpty" />
                       </node>
                     </node>
                   </node>

diff --git a/...e/languages/org.iets3.core.expr.genjava.temporal/org.iets3.core.expr.genjava.temporal.mpl b/...e/languages/org.iets3.core.expr.genjava.temporal/org.iets3.core.expr.genjava.temporal.mpl
@@ -23,7 +23,9 @@
           <classes generated="true" path="${module}/generator/classes_gen" />
         </facet>
       </facets>
-      <external-templates />
+      <external-templates>
+        <generator generatorUID="4517af98-2eaa-4f19-a962-92df60010094(org.iets3.core.expr.genjava.base#8286534136181746510)" />
+      </external-templates>
       <dependencies>
         <dependency reexport="false">4621d3e3-b8a3-4bbe-b7ac-234b6e2d1d68(org.iets3.core.expr.temporal)</dependency>
         <dependency reexport="false">4517af98-2eaa-4f19-a962-92df60010094(org.iets3.core.expr.genjava.base#8286534136181746510)</dependency>