Merge pull request #914 from IETS3/merge/mps20222

Merge maintenance/mps20222 into maintenance/mps20223
IETS3 · Apr 15, 2024 · 1cb67ec · 1cb67ec
2 parents e522a9b + 56ec405
commit 1cb67ec
Show file tree

Hide file tree

Showing 7 changed files with 1,134 additions and 105 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -16,6 +16,10 @@ The project does _not_ follow Semantic Versioning and the changes are documented
 - `ComponentKind#canbeContent(conceptNode<>)` was deprecated in favour of `ComponentKind#canbeContent(concept<>)` 
 - `Component#canBeInComponentContent(conceptNode<>)` was deprecated in favour of `Component#canBeInComponentContent(concept<>)`
 
+### Added
+
+- Numbers ranges now support exclusive and inclusive intervals.
+
 ## March 2024
 
 ### Added

diff --git a/...guages/org.iets3.opensource/languages/org.iets3.core.expr.simpleTypes/models/behavior.mps b/...guages/org.iets3.opensource/languages/org.iets3.core.expr.simpleTypes/models/behavior.mps
diff --git a/...anguages/org.iets3.opensource/languages/org.iets3.core.expr.simpleTypes/models/editor.mps b/...anguages/org.iets3.opensource/languages/org.iets3.core.expr.simpleTypes/models/editor.mps
@@ -21,6 +21,7 @@
     <import index="cj4x" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.openapi.editor(MPS.Editor/)" implicit="true" />
     <import index="mhbf" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.model(MPS.OpenAPI/)" implicit="true" />
     <import index="hm2y" ref="r:66e07cb4-a4b0-4bf3-a36d-5e9ed1ff1bd3(org.iets3.core.expr.base.structure)" implicit="true" />
+    <import index="b1h1" ref="r:ac5f749f-6179-4d4f-ad24-ad9edbd8077b(org.iets3.core.expr.simpleTypes.behavior)" implicit="true" />
     <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" implicit="true" />
   </imports>
   <registry>
@@ -38,6 +39,7 @@
         <child id="784421273959492606" name="nodeFunction" index="mvV$0" />
       </concept>
       <concept id="784421273959493166" name="jetbrains.mps.lang.editor.structure.QueryFunction_TransformationMenu_TargetNode" flags="ig" index="mvVNg" />
+      <concept id="1142886811589" name="jetbrains.mps.lang.editor.structure.ConceptFunctionParameter_node" flags="nn" index="pncrf" />
       <concept id="1080736578640" name="jetbrains.mps.lang.editor.structure.BaseEditorComponent" flags="ig" index="2wURMF">
         <child id="1080736633877" name="cellModel" index="2wV5jI" />
       </concept>
@@ -675,12 +677,25 @@
     <ref role="1XX52x" to="5qo5:19PglA20qX_" resolve="NumberRangeSpec" />
     <node concept="3EZMnI" id="19PglA20r05" role="2wV5jI">
       <node concept="2iRfu4" id="5i1yF0wqXGJ" role="2iSdaV" />
-      <node concept="3F0ifn" id="19PglA20r01" role="3EZMnx">
-        <property role="3F0ifm" value="[" />
-        <node concept="11LMrY" id="19PglA20rb6" role="3F10Kt">
+      <node concept="1HlG4h" id="2MMBR00YETl" role="3EZMnx">
+        <node concept="1HfYo3" id="2MMBR00YETp" role="1HlULh">
+          <node concept="3TQlhw" id="2MMBR00YETt" role="1Hhtcw">
+            <node concept="3clFbS" id="2MMBR00YETx" role="2VODD2">
+              <node concept="3clFbF" id="2MMBR00YFaQ" role="3cqZAp">
+                <node concept="2OqwBi" id="2MMBR00YFoP" role="3clFbG">
+                  <node concept="pncrf" id="2MMBR00YFaP" role="2Oq$k0" />
+                  <node concept="2qgKlT" id="2MMBR00YF$_" role="2OqNvi">
+                    <ref role="37wK5l" to="b1h1:1HYdmFH2Ri" resolve="getStartBracket" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="11L4FC" id="2MMBR00YF65" role="3F10Kt">
           <property role="VOm3f" value="true" />
         </node>
-        <node concept="11L4FC" id="2NHHcg2C$eX" role="3F10Kt">
+        <node concept="11LMrY" id="2MMBR00YF7O" role="3F10Kt">
           <property role="VOm3f" value="true" />
         </node>
       </node>
@@ -745,15 +760,31 @@
           </node>
         </node>
       </node>
-      <node concept="3F0ifn" id="19PglA20r1q" role="3EZMnx">
-        <property role="3F0ifm" value="]" />
-        <node concept="11L4FC" id="19PglA20rbi" role="3F10Kt">
-          <property role="VOm3f" value="true" />
-        </node>
-      </node>
       <node concept="34QqEe" id="6Oy4N$q5tUL" role="3F10Kt">
         <property role="VOm3f" value="true" />
       </node>
+      <node concept="1HlG4h" id="2MMBR00YFMG" role="3EZMnx">
+        <node concept="11L4FC" id="2MMBR00YG8u" role="3F10Kt">
+          <property role="VOm3f" value="true" />
+        </node>
+        <node concept="11LMrY" id="2MMBR00YG8v" role="3F10Kt">
+          <property role="VOm3f" value="true" />
+        </node>
+        <node concept="1HfYo3" id="2MMBR00YFMJ" role="1HlULh">
+          <node concept="3TQlhw" id="2MMBR00YFMM" role="1Hhtcw">
+            <node concept="3clFbS" id="2MMBR00YFMP" role="2VODD2">
+              <node concept="3clFbF" id="2MMBR00YFTL" role="3cqZAp">
+                <node concept="2OqwBi" id="2MMBR00YFUi" role="3clFbG">
+                  <node concept="pncrf" id="2MMBR00YFTK" role="2Oq$k0" />
+                  <node concept="2qgKlT" id="2MMBR00YFWS" role="2OqNvi">
+                    <ref role="37wK5l" to="b1h1:1HYdmFH3l9" resolve="getEndBracket" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
     </node>
   </node>
   <node concept="24kQdi" id="7DTWJ$8kg4G">

diff --git a/...ages/org.iets3.opensource/languages/org.iets3.core.expr.simpleTypes/models/intentions.mps b/...ages/org.iets3.opensource/languages/org.iets3.core.expr.simpleTypes/models/intentions.mps
@@ -75,10 +75,14 @@
       <concept id="1068580320020" name="jetbrains.mps.baseLanguage.structure.IntegerConstant" flags="nn" index="3cmrfG">
         <property id="1068580320021" name="value" index="3cmrfH" />
       </concept>
+      <concept id="1068581242875" name="jetbrains.mps.baseLanguage.structure.PlusExpression" flags="nn" index="3cpWs3" />
       <concept id="1068581242864" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclarationStatement" flags="nn" index="3cpWs8">
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
+      <concept id="1079359253375" name="jetbrains.mps.baseLanguage.structure.ParenthesizedExpression" flags="nn" index="1eOMI4">
+        <child id="1079359253376" name="expression" index="1eOMHV" />
+      </concept>
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
@@ -90,6 +94,11 @@
         <child id="1081773367579" name="rightExpression" index="3uHU7w" />
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
+      <concept id="1163668896201" name="jetbrains.mps.baseLanguage.structure.TernaryOperatorExpression" flags="nn" index="3K4zz7">
+        <child id="1163668914799" name="condition" index="3K4Cdx" />
+        <child id="1163668922816" name="ifTrue" index="3K4E3e" />
+        <child id="1163668934364" name="ifFalse" index="3K4GZi" />
+      </concept>
       <concept id="1080120340718" name="jetbrains.mps.baseLanguage.structure.AndExpression" flags="nn" index="1Wc70l" />
     </language>
     <language id="b92f861d-0184-446d-b88b-6dcf0e070241" name="com.mbeddr.mpsutil.intentions">
@@ -863,5 +872,113 @@
       </node>
     </node>
   </node>
+  <node concept="2S6QgY" id="2MMBR00YGax">
+    <property role="3GE5qa" value="numeric.number" />
+    <property role="TrG5h" value="toggleExcludeMin" />
+    <ref role="2ZfgGC" to="5qo5:19PglA20qX_" resolve="NumberRangeSpec" />
+    <node concept="2S6ZIM" id="2MMBR00YGay" role="2ZfVej">
+      <node concept="3clFbS" id="2MMBR00YGaz" role="2VODD2">
+        <node concept="3clFbF" id="2MMBR00Z8IO" role="3cqZAp">
+          <node concept="3cpWs3" id="2MMBR00Za$u" role="3clFbG">
+            <node concept="Xl_RD" id="2MMBR00ZaEL" role="3uHU7w">
+              <property role="Xl_RC" value=" Exclude Minimum in Range" />
+            </node>
+            <node concept="1eOMI4" id="2MMBR00Zay5" role="3uHU7B">
+              <node concept="3K4zz7" id="2MMBR00Z9AO" role="1eOMHV">
+                <node concept="Xl_RD" id="2MMBR00Z9C_" role="3K4E3e">
+                  <property role="Xl_RC" value="Don't" />
+                </node>
+                <node concept="Xl_RD" id="2MMBR00Za4U" role="3K4GZi">
+                  <property role="Xl_RC" value="" />
+                </node>
+                <node concept="2OqwBi" id="2MMBR00Z8WN" role="3K4Cdx">
+                  <node concept="2Sf5sV" id="2MMBR00Z8IN" role="2Oq$k0" />
+                  <node concept="3TrcHB" id="2MMBR00Z9ab" role="2OqNvi">
+                    <ref role="3TsBF5" to="5qo5:1HYdmFH2oU" resolve="excludeMin" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2Sbjvc" id="2MMBR00YGa$" role="2ZfgGD">
+      <node concept="3clFbS" id="2MMBR00YGa_" role="2VODD2">
+        <node concept="3clFbF" id="2MMBR00ZaQZ" role="3cqZAp">
+          <node concept="37vLTI" id="2MMBR00ZaXC" role="3clFbG">
+            <node concept="3fqX7Q" id="2MMBR00Zb0u" role="37vLTx">
+              <node concept="2OqwBi" id="2MMBR00Zbaz" role="3fr31v">
+                <node concept="2Sf5sV" id="2MMBR00Zb89" role="2Oq$k0" />
+                <node concept="3TrcHB" id="2MMBR00Zbfo" role="2OqNvi">
+                  <ref role="3TsBF5" to="5qo5:1HYdmFH2oU" resolve="excludeMin" />
+                </node>
+              </node>
+            </node>
+            <node concept="2OqwBi" id="2MMBR00ZaRj" role="37vLTJ">
+              <node concept="2Sf5sV" id="2MMBR00ZaQY" role="2Oq$k0" />
+              <node concept="3TrcHB" id="2MMBR00ZaV1" role="2OqNvi">
+                <ref role="3TsBF5" to="5qo5:1HYdmFH2oU" resolve="excludeMin" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+  </node>
+  <node concept="2S6QgY" id="2MMBR00Zbl8">
+    <property role="3GE5qa" value="numeric.number" />
+    <property role="TrG5h" value="toggleExcludeMax" />
+    <ref role="2ZfgGC" to="5qo5:19PglA20qX_" resolve="NumberRangeSpec" />
+    <node concept="2S6ZIM" id="2MMBR00Zbl9" role="2ZfVej">
+      <node concept="3clFbS" id="2MMBR00Zbla" role="2VODD2">
+        <node concept="3clFbF" id="2MMBR00Zblb" role="3cqZAp">
+          <node concept="3cpWs3" id="2MMBR00Zblc" role="3clFbG">
+            <node concept="Xl_RD" id="2MMBR00Zbld" role="3uHU7w">
+              <property role="Xl_RC" value=" Exclude Maximum in Range" />
+            </node>
+            <node concept="1eOMI4" id="2MMBR00Zble" role="3uHU7B">
+              <node concept="3K4zz7" id="2MMBR00Zblf" role="1eOMHV">
+                <node concept="Xl_RD" id="2MMBR00Zblg" role="3K4E3e">
+                  <property role="Xl_RC" value="Don't" />
+                </node>
+                <node concept="Xl_RD" id="2MMBR00Zblh" role="3K4GZi">
+                  <property role="Xl_RC" value="" />
+                </node>
+                <node concept="2OqwBi" id="2MMBR00Zbli" role="3K4Cdx">
+                  <node concept="2Sf5sV" id="2MMBR00Zblj" role="2Oq$k0" />
+                  <node concept="3TrcHB" id="2MMBR00Zblk" role="2OqNvi">
+                    <ref role="3TsBF5" to="5qo5:1HYdmFH2Bh" resolve="excludeMax" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2Sbjvc" id="2MMBR00Zbll" role="2ZfgGD">
+      <node concept="3clFbS" id="2MMBR00Zblm" role="2VODD2">
+        <node concept="3clFbF" id="2MMBR00Zbln" role="3cqZAp">
+          <node concept="37vLTI" id="2MMBR00Zblo" role="3clFbG">
+            <node concept="3fqX7Q" id="2MMBR00Zblp" role="37vLTx">
+              <node concept="2OqwBi" id="2MMBR00Zblq" role="3fr31v">
+                <node concept="2Sf5sV" id="2MMBR00Zblr" role="2Oq$k0" />
+                <node concept="3TrcHB" id="2MMBR00Zbls" role="2OqNvi">
+                  <ref role="3TsBF5" to="5qo5:1HYdmFH2Bh" resolve="excludeMax" />
+                </node>
+              </node>
+            </node>
+            <node concept="2OqwBi" id="2MMBR00Zblt" role="37vLTJ">
+              <node concept="2Sf5sV" id="2MMBR00Zblu" role="2Oq$k0" />
+              <node concept="3TrcHB" id="2MMBR00Zblv" role="2OqNvi">
+                <ref role="3TsBF5" to="5qo5:1HYdmFH2Bh" resolve="excludeMax" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+  </node>
 </model>
 
diff --git a/...uages/org.iets3.opensource/languages/org.iets3.core.expr.simpleTypes/models/structure.mps b/...uages/org.iets3.opensource/languages/org.iets3.core.expr.simpleTypes/models/structure.mps
@@ -185,11 +185,21 @@
       <property role="TrG5h" value="min" />
       <ref role="AX2Wp" to="tpck:fKAOsGN" resolve="string" />
     </node>
+    <node concept="1TJgyi" id="1HYdmFH2oU" role="1TKVEl">
+      <property role="IQ2nx" value="30954369053894202" />
+      <property role="TrG5h" value="excludeMin" />
+      <ref role="AX2Wp" to="tpck:fKAQMTB" resolve="boolean" />
+    </node>
     <node concept="1TJgyi" id="19PglA20qXK" role="1TKVEl">
       <property role="IQ2nx" value="1330041117646892912" />
       <property role="TrG5h" value="max" />
       <ref role="AX2Wp" to="tpck:fKAOsGN" resolve="string" />
     </node>
+    <node concept="1TJgyi" id="1HYdmFH2Bh" role="1TKVEl">
+      <property role="IQ2nx" value="30954369053895121" />
+      <property role="TrG5h" value="excludeMax" />
+      <ref role="AX2Wp" to="tpck:fKAQMTB" resolve="boolean" />
+    </node>
   </node>
   <node concept="1TIwiD" id="78hTg1$P0UC">
     <property role="EcuMT" value="8219602584782245544" />

diff --git a/...ages/org.iets3.opensource/languages/org.iets3.core.expr.simpleTypes/models/typesystem.mps b/...ages/org.iets3.opensource/languages/org.iets3.core.expr.simpleTypes/models/typesystem.mps
@@ -3561,7 +3561,7 @@
             <node concept="3clFbS" id="3p6$WoEzUg8" role="3clFbx">
               <node concept="2MkqsV" id="3p6$WoEzUA7" role="3cqZAp">
                 <node concept="Xl_RD" id="3p6$WoEzUAm" role="2MkJ7o">
-                  <property role="Xl_RC" value="invalid range (max &lt; min or precison error)" />
+                  <property role="Xl_RC" value="invalid range (max &lt; min or precision error)" />
                 </node>
                 <node concept="1YBJjd" id="3p6$WoEzUBQ" role="1urrMF">
                   <ref role="1YBMHb" node="3p6$WoEzUg2" resolve="nt" />