Skip to content

Commit 0cd9e91

Browse files
alexanderpannalexanderpann
authored
Merge branch 'master' into bugfix/SpreadsheetAddSheet#559
2 parents 7290211 + 319ea23 commit 0cd9e91

File tree

6 files changed

+53
-75
lines changed

6 files changed

+53
-75
lines changed

‎build.gradle‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -301,6 +301,18 @@ publishing {
301301
}
302302
}
303303
}
304+
maven {
305+
name = "itemisCloud"
306+
url = version.toString().endsWith("-SNAPSHOT")
307+
? uri("https://artifacts.itemis.cloud/repository/maven-mps-snapshots/")
308+
: uri("https://artifacts.itemis.cloud/repository/maven-mps-releases/")
309+
if (project.hasProperty("artifacts.itemis.cloud.user") && project.hasProperty("artifacts.itemis.cloud.pw")) {
310+
credentials {
311+
username = project.findProperty("artifacts.itemis.cloud.user")
312+
password = project.findProperty("artifacts.itemis.cloud.pw")
313+
}
314+
}
315+
}
304316
}
305317
repositories {
306318
if(currentBranch == "master" || currentBranch.startsWith("maintenance") || currentBranch.startsWith("mps")) {

‎code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/editor.mps‎

Lines changed: 3 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -2151,24 +2151,6 @@
21512151
<node concept="3F0ifn" id="1Ez$z58Hu8o" role="3EZMnx">
21522152
<property role="3F0ifm" value="error" />
21532153
<ref role="1k5W1q" to="itrz:4rZeNQ6MfR7" resolve="iets3Keyword" />
2154-
<node concept="11LMrY" id="1Ez$z58IP7n" role="3F10Kt">
2155-
<property role="VOm3f" value="true" />
2156-
<node concept="3nzxsE" id="1Ez$z58IP7q" role="3n$kyP">
2157-
<node concept="3clFbS" id="1Ez$z58IP7r" role="2VODD2">
2158-
<node concept="3clFbF" id="1Ez$z58IP84" role="3cqZAp">
2159-
<node concept="3y3z36" id="1Ez$z58IPno" role="3clFbG">
2160-
<node concept="10Nm6u" id="1Ez$z58IPoy" role="3uHU7w" />
2161-
<node concept="2OqwBi" id="1Ez$z58IPaF" role="3uHU7B">
2162-
<node concept="pncrf" id="1Ez$z58IP83" role="2Oq$k0" />
2163-
<node concept="3TrEf2" id="1Ez$z58IPg3" role="2OqNvi">
2164-
<ref role="3Tt5mk" to="hm2y:1Ez$z58Hu7L" resolve="error" />
2165-
</node>
2166-
</node>
2167-
</node>
2168-
</node>
2169-
</node>
2170-
</node>
2171-
</node>
21722154
</node>
21732155
<node concept="_tjkj" id="1Ez$z58Hu8B" role="3EZMnx">
21742156
<node concept="3EZMnI" id="1Ez$z58Hu8L" role="_tjki">
@@ -2194,6 +2176,9 @@
21942176
<node concept="VPM3Z" id="1Ez$z58Hu8P" role="3F10Kt">
21952177
<property role="VOm3f" value="false" />
21962178
</node>
2179+
<node concept="11L4FC" id="7JKsSwYyQXa" role="3F10Kt">
2180+
<property role="VOm3f" value="true" />
2181+
</node>
21972182
</node>
21982183
</node>
21992184
<node concept="2iRfu4" id="1Ez$z58Hu8h" role="2iSdaV" />
@@ -4589,9 +4574,6 @@
45894574
<node concept="3F0ifn" id="mQGcCvPufx" role="3EZMnx">
45904575
<property role="3F0ifm" value="fail" />
45914576
<ref role="1k5W1q" to="itrz:4rZeNQ6MfR7" resolve="iets3Keyword" />
4592-
<node concept="11LMrY" id="6jT4GDwsanM" role="3F10Kt">
4593-
<property role="VOm3f" value="true" />
4594-
</node>
45954577
</node>
45964578
<node concept="_tjkj" id="6jT4GDw7eTM" role="3EZMnx">
45974579
<node concept="3EZMnI" id="6jT4GDw7eSK" role="_tjki">

‎code/languages/org.iets3.opensource/languages/org.iets3.core.expr.messages/models/structure.mps‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -216,13 +216,12 @@
216216
<property role="R4oN_" value="a message argument" />
217217
<ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
218218
<node concept="PrWs8" id="3vxfdxbdUeE" role="PzmwI">
219-
<ref role="PrY4T" to="tpck:h0TrEE$" resolve="INamedConcept" />
219+
<ref role="PrY4T" to="4kwy:cJpacq5T0O" resolve="IValidNamedConcept" />
220220
</node>
221221
<node concept="1TJgyj" id="3vxfdxbdUeH" role="1TKVEi">
222222
<property role="IQ2ns" value="4026566441518474157" />
223223
<property role="20lmBu" value="fLJjDmT/aggregation" />
224224
<property role="20kJfa" value="type" />
225-
<property role="20lbJX" value="fLJekj4/_1" />
226225
<ref role="20lvS9" to="hm2y:6sdnDbSlaok" resolve="Type" />
227226
</node>
228227
</node>

‎code/languages/org.iets3.opensource/languages/org.iets3.core.expr.mutable/models/behavior.mps‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1664,9 +1664,12 @@
16641664
<node concept="13i0hz" id="4IV0h47jS3m" role="13h7CS">
16651665
<property role="TrG5h" value="expectedType" />
16661666
<property role="13i0it" value="true" />
1667-
<property role="13i0iv" value="true" />
16681667
<node concept="3Tm1VV" id="4IV0h47jS3n" role="1B3o_S" />
1669-
<node concept="3clFbS" id="4IV0h47jS3p" role="3clF47" />
1668+
<node concept="3clFbS" id="4IV0h47jS3p" role="3clF47">
1669+
<node concept="3clFbF" id="7JKsSwYB5ZH" role="3cqZAp">
1670+
<node concept="10Nm6u" id="7JKsSwYB5ZG" role="3clFbG" />
1671+
</node>
1672+
</node>
16701673
<node concept="3Tqbb2" id="4IV0h47Eqok" role="3clF45">
16711674
<ref role="ehGHo" to="hm2y:6sdnDbSlaok" resolve="Type" />
16721675
</node>

‎code/languages/org.iets3.opensource/languages/org.iets3.core.expr.simpleTypes/models/behavior.mps‎

Lines changed: 29 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -99,9 +99,6 @@
9999
<concept id="1081236700937" name="jetbrains.mps.baseLanguage.structure.StaticMethodCall" flags="nn" index="2YIFZM">
100100
<reference id="1144433194310" name="classConcept" index="1Pybhc" />
101101
</concept>
102-
<concept id="1164991038168" name="jetbrains.mps.baseLanguage.structure.ThrowStatement" flags="nn" index="YS8fn">
103-
<child id="1164991057263" name="throwable" index="YScLw" />
104-
</concept>
105102
<concept id="1070533707846" name="jetbrains.mps.baseLanguage.structure.StaticFieldReference" flags="nn" index="10M0yZ">
106103
<reference id="1144433057691" name="classifier" index="1PxDUh" />
107104
</concept>
@@ -241,6 +238,12 @@
241238
<child id="8182547171709752112" name="expression" index="36biLW" />
242239
</concept>
243240
</language>
241+
<language id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" name="jetbrains.mps.baseLanguage.logging">
242+
<concept id="2034914114981261497" name="jetbrains.mps.baseLanguage.logging.structure.LogLowLevelStatement" flags="ng" index="RRSsy">
243+
<property id="2034914114981261751" name="severity" index="RRSoG" />
244+
<child id="2034914114981261753" name="message" index="RRSoy" />
245+
</concept>
246+
</language>
244247
<language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
245248
<concept id="1177026924588" name="jetbrains.mps.lang.smodel.structure.RefConcept_Reference" flags="nn" index="chp4Y">
246249
<reference id="1177026940964" name="conceptDeclaration" index="cht4Q" />
@@ -5266,14 +5269,10 @@
52665269
<node concept="3clFbS" id="7Wa2sv3EZOx" role="3clF47">
52675270
<node concept="3clFbJ" id="3z1zSuyKmFc" role="3cqZAp">
52685271
<node concept="3clFbS" id="3z1zSuyKmFe" role="3clFbx">
5269-
<node concept="YS8fn" id="3z1zSuyKnAM" role="3cqZAp">
5270-
<node concept="2ShNRf" id="3z1zSuyKnB8" role="YScLw">
5271-
<node concept="1pGfFk" id="3z1zSuyKoRx" role="2ShVmc">
5272-
<ref role="37wK5l" to="wyt6:~IllegalArgumentException.&lt;init&gt;(java.lang.String)" resolve="IllegalArgumentException" />
5273-
<node concept="Xl_RD" id="3z1zSuyKoUv" role="37wK5m">
5274-
<property role="Xl_RC" value="Negative number precision is not allowed" />
5275-
</node>
5276-
</node>
5272+
<node concept="RRSsy" id="7JKsSwYB_2j" role="3cqZAp">
5273+
<property role="RRSoG" value="gZ5fksE/warn" />
5274+
<node concept="Xl_RD" id="7JKsSwYB_2l" role="RRSoy">
5275+
<property role="Xl_RC" value="Negative number precision is not allowed" />
52775276
</node>
52785277
</node>
52795278
</node>
@@ -5285,21 +5284,25 @@
52855284
<ref role="3cqZAo" node="7Wa2sv3F02P" resolve="p" />
52865285
</node>
52875286
</node>
5288-
</node>
5289-
<node concept="3clFbF" id="7Wa2sv3F03e" role="3cqZAp">
5290-
<node concept="37vLTI" id="7Wa2sv3F0zj" role="3clFbG">
5291-
<node concept="3cpWs3" id="7Wa2sv3F1Pt" role="37vLTx">
5292-
<node concept="Xl_RD" id="7Wa2sv3F1Pw" role="3uHU7w">
5293-
<property role="Xl_RC" value="" />
5294-
</node>
5295-
<node concept="37vLTw" id="7Wa2sv3F0z_" role="3uHU7B">
5296-
<ref role="3cqZAo" node="7Wa2sv3F02P" resolve="p" />
5297-
</node>
5298-
</node>
5299-
<node concept="2OqwBi" id="7Wa2sv3F08C" role="37vLTJ">
5300-
<node concept="13iPFW" id="7Wa2sv3F03d" role="2Oq$k0" />
5301-
<node concept="3TrcHB" id="7Wa2sv3F0eI" role="2OqNvi">
5302-
<ref role="3TsBF5" to="5qo5:19PglA20qY6" resolve="prec" />
5287+
<node concept="9aQIb" id="7JKsSwYB_h_" role="9aQIa">
5288+
<node concept="3clFbS" id="7JKsSwYB_hA" role="9aQI4">
5289+
<node concept="3clFbF" id="7Wa2sv3F03e" role="3cqZAp">
5290+
<node concept="37vLTI" id="7Wa2sv3F0zj" role="3clFbG">
5291+
<node concept="3cpWs3" id="7Wa2sv3F1Pt" role="37vLTx">
5292+
<node concept="Xl_RD" id="7Wa2sv3F1Pw" role="3uHU7w">
5293+
<property role="Xl_RC" value="" />
5294+
</node>
5295+
<node concept="37vLTw" id="7Wa2sv3F0z_" role="3uHU7B">
5296+
<ref role="3cqZAo" node="7Wa2sv3F02P" resolve="p" />
5297+
</node>
5298+
</node>
5299+
<node concept="2OqwBi" id="7Wa2sv3F08C" role="37vLTJ">
5300+
<node concept="13iPFW" id="7Wa2sv3F03d" role="2Oq$k0" />
5301+
<node concept="3TrcHB" id="7Wa2sv3F0eI" role="2OqNvi">
5302+
<ref role="3TsBF5" to="5qo5:19PglA20qY6" resolve="prec" />
5303+
</node>
5304+
</node>
5305+
</node>
53035306
</node>
53045307
</node>
53055308
</node>

‎code/languages/org.iets3.opensource/languages/org.iets3.core.expr.toplevel/models/org/iets3/core/expr/toplevel/editor.mps‎

Lines changed: 3 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1765,13 +1765,13 @@
17651765
<property role="VOm3f" value="true" />
17661766
</node>
17671767
</node>
1768-
<node concept="l2Vlx" id="3WWvqarUH$5" role="2iSdaV" />
17691768
<node concept="VPM3Z" id="3WWvqarUH$6" role="3F10Kt">
17701769
<property role="VOm3f" value="false" />
17711770
</node>
17721771
<node concept="11L4FC" id="3WWvqarUH$7" role="3F10Kt">
17731772
<property role="VOm3f" value="true" />
17741773
</node>
1774+
<node concept="l2Vlx" id="3WWvqarUH$5" role="2iSdaV" />
17751775
</node>
17761776
</node>
17771777
<node concept="3F0ifn" id="3WWvqarUJIZ" role="3EZMnx">
@@ -1899,13 +1899,6 @@
18991899
<property role="VOm3f" value="true" />
19001900
</node>
19011901
</node>
1902-
<node concept="ZYGn8" id="68WOIGeG1Ja" role="ZWbT9">
1903-
<node concept="3clFbS" id="68WOIGeG1Jb" role="2VODD2">
1904-
<node concept="3clFbF" id="68WOIGeG1Jl" role="3cqZAp">
1905-
<node concept="10Nm6u" id="68WOIGeG1Jk" role="3clFbG" />
1906-
</node>
1907-
</node>
1908-
</node>
19091902
</node>
19101903
<node concept="3F0ifn" id="3YhAT14YvNu" role="3EZMnx">
19111904
<property role="3F0ifm" value="{..}" />
@@ -1968,6 +1961,7 @@
19681961
</node>
19691962
</node>
19701963
</node>
1964+
<node concept="l2Vlx" id="3WWvqarUGzE" role="2iSdaV" />
19711965
<node concept="_tjkj" id="3WWvqarUGzv" role="3EZMnx">
19721966
<node concept="3EZMnI" id="3WWvqarUGzw" role="_tjki">
19731967
<node concept="3F0ifn" id="3WWvqarUGzx" role="3EZMnx">
@@ -1988,23 +1982,15 @@
19881982
<property role="VOm3f" value="true" />
19891983
</node>
19901984
</node>
1991-
<node concept="l2Vlx" id="3WWvqarUGzB" role="2iSdaV" />
19921985
<node concept="VPM3Z" id="3WWvqarUGzC" role="3F10Kt">
19931986
<property role="VOm3f" value="false" />
19941987
</node>
19951988
<node concept="11L4FC" id="3WWvqarUGzD" role="3F10Kt">
19961989
<property role="VOm3f" value="true" />
19971990
</node>
1998-
</node>
1999-
<node concept="ZYGn8" id="68WOIGeG1KK" role="ZWbT9">
2000-
<node concept="3clFbS" id="68WOIGeG1KL" role="2VODD2">
2001-
<node concept="3clFbF" id="68WOIGeG1KV" role="3cqZAp">
2002-
<node concept="10Nm6u" id="68WOIGeG1KU" role="3clFbG" />
2003-
</node>
2004-
</node>
1991+
<node concept="l2Vlx" id="3WWvqarUGzB" role="2iSdaV" />
20051992
</node>
20061993
</node>
2007-
<node concept="l2Vlx" id="3WWvqarUGzE" role="2iSdaV" />
20081994
<node concept="3F0ifn" id="3WWvqarUGzF" role="3EZMnx">
20091995
<property role="3F0ifm" value="{" />
20101996
</node>
@@ -2224,13 +2210,6 @@
22242210
<property role="VOm3f" value="true" />
22252211
</node>
22262212
</node>
2227-
<node concept="ZYGn8" id="68WOIGeKJyS" role="ZWbT9">
2228-
<node concept="3clFbS" id="68WOIGeKJyT" role="2VODD2">
2229-
<node concept="3clFbF" id="68WOIGeKJz$" role="3cqZAp">
2230-
<node concept="10Nm6u" id="68WOIGeKJzz" role="3clFbG" />
2231-
</node>
2232-
</node>
2233-
</node>
22342213
</node>
22352214
<node concept="2iRfu4" id="3YhAT14Yx9m" role="2iSdaV" />
22362215
<node concept="VPM3Z" id="3YhAT14Yx9n" role="3F10Kt">

0 commit comments

Comments
 (0)