Skip to content

Commit ecafadf

Browse files
wsafonovwsafonov
committed
prevent negative number precision
1 parent 94ae618 commit ecafadf

File tree

4 files changed

+85
-8
lines changed

4 files changed

+85
-8
lines changed

‎code/languages/org.iets3.opensource/.mps/vcs.xml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,13 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<project version="4">
3+
<component name="GithubSharedProjectSettings">
4+
<option name="branchProtectionPatterns">
5+
<list>
6+
<option value="master" />
7+
<option value="maintenance\/.*" />
8+
</list>
9+
</option>
10+
</component>
311
<component name="IssueNavigationConfiguration">
412
<option name="links">
513
<list>

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

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,9 @@
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>
102105
<concept id="1070533707846" name="jetbrains.mps.baseLanguage.structure.StaticFieldReference" flags="nn" index="10M0yZ">
103106
<reference id="1144433057691" name="classifier" index="1PxDUh" />
104107
</concept>
@@ -5261,6 +5264,28 @@
52615264
<node concept="3Tm1VV" id="7Wa2sv3EZOv" role="1B3o_S" />
52625265
<node concept="3cqZAl" id="7Wa2sv3F02p" role="3clF45" />
52635266
<node concept="3clFbS" id="7Wa2sv3EZOx" role="3clF47">
5267+
<node concept="3clFbJ" id="3z1zSuyKmFc" role="3cqZAp">
5268+
<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>
5277+
</node>
5278+
</node>
5279+
</node>
5280+
<node concept="3eOVzh" id="3z1zSuyKnx4" role="3clFbw">
5281+
<node concept="3cmrfG" id="3z1zSuyKnx7" role="3uHU7w">
5282+
<property role="3cmrfH" value="0" />
5283+
</node>
5284+
<node concept="37vLTw" id="3z1zSuyKmG7" role="3uHU7B">
5285+
<ref role="3cqZAo" node="7Wa2sv3F02P" resolve="p" />
5286+
</node>
5287+
</node>
5288+
</node>
52645289
<node concept="3clFbF" id="7Wa2sv3F03e" role="3cqZAp">
52655290
<node concept="37vLTI" id="7Wa2sv3F0zj" role="3clFbG">
52665291
<node concept="3cpWs3" id="7Wa2sv3F1Pt" role="37vLTx">

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

Lines changed: 22 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<import index="b1h1" ref="r:ac5f749f-6179-4d4f-ad24-ad9edbd8077b(org.iets3.core.expr.simpleTypes.behavior)" />
1010
<import index="oq0c" ref="r:6c6155f0-4bbe-4af5-8c26-244d570e21e4(org.iets3.core.expr.base.plugin)" />
1111
<import index="hm2y" ref="r:66e07cb4-a4b0-4bf3-a36d-5e9ed1ff1bd3(org.iets3.core.expr.base.structure)" />
12-
<import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" implicit="true" />
12+
<import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" />
1313
<import index="pbu6" ref="r:83e946de-2a7f-4a4c-b3c9-4f671aa7f2db(org.iets3.core.expr.base.behavior)" implicit="true" />
1414
</imports>
1515
<registry>
@@ -22,6 +22,7 @@
2222
<child id="1068498886297" name="rValue" index="37vLTx" />
2323
<child id="1068498886295" name="lValue" index="37vLTJ" />
2424
</concept>
25+
<concept id="1153417849900" name="jetbrains.mps.baseLanguage.structure.GreaterThanOrEqualsExpression" flags="nn" index="2d3UOw" />
2526
<concept id="1202948039474" name="jetbrains.mps.baseLanguage.structure.InstanceMethodCallOperation" flags="nn" index="liA8E" />
2627
<concept id="8118189177080264853" name="jetbrains.mps.baseLanguage.structure.AlternativeType" flags="ig" index="nSUau">
2728
<child id="8118189177080264854" name="alternative" index="nSUat" />
@@ -43,6 +44,7 @@
4344
<concept id="1070533707846" name="jetbrains.mps.baseLanguage.structure.StaticFieldReference" flags="nn" index="10M0yZ">
4445
<reference id="1144433057691" name="classifier" index="1PxDUh" />
4546
</concept>
47+
<concept id="1070534370425" name="jetbrains.mps.baseLanguage.structure.IntegerType" flags="in" index="10Oyi0" />
4648
<concept id="1068431474542" name="jetbrains.mps.baseLanguage.structure.VariableDeclaration" flags="ng" index="33uBYm">
4749
<property id="1176718929932" name="isFinal" index="3TUv4t" />
4850
<child id="1068431790190" name="initializer" index="33vP2m" />
@@ -69,6 +71,9 @@
6971
<concept id="1068580123137" name="jetbrains.mps.baseLanguage.structure.BooleanConstant" flags="nn" index="3clFbT">
7072
<property id="1068580123138" name="value" index="3clFbU" />
7173
</concept>
74+
<concept id="1068580320020" name="jetbrains.mps.baseLanguage.structure.IntegerConstant" flags="nn" index="3cmrfG">
75+
<property id="1068580320021" name="value" index="3cmrfH" />
76+
</concept>
7277
<concept id="1068581242878" name="jetbrains.mps.baseLanguage.structure.ReturnStatement" flags="nn" index="3cpWs6">
7378
<child id="1068581517676" name="expression" index="3cqZAk" />
7479
</concept>
@@ -269,16 +274,25 @@
269274
</node>
270275
</node>
271276
<node concept="3clFbS" id="7Wa2sv3FlYV" role="1zxBo7">
272-
<node concept="3clFbF" id="7Wa2sv3Fm85" role="3cqZAp">
273-
<node concept="2YIFZM" id="7Wa2sv3Fl7p" role="3clFbG">
274-
<ref role="1Pybhc" to="wyt6:~Integer" resolve="Integer" />
275-
<ref role="37wK5l" to="wyt6:~Integer.parseInt(java.lang.String)" resolve="parseInt" />
276-
<node concept="1Wqviy" id="7Wa2sv3FlpM" role="37wK5m" />
277+
<node concept="3cpWs8" id="4Oomam7raEP" role="3cqZAp">
278+
<node concept="3cpWsn" id="4Oomam7raEQ" role="3cpWs9">
279+
<property role="TrG5h" value="prec" />
280+
<node concept="10Oyi0" id="4Oomam7raEJ" role="1tU5fm" />
281+
<node concept="2YIFZM" id="4Oomam7raER" role="33vP2m">
282+
<ref role="1Pybhc" to="wyt6:~Integer" resolve="Integer" />
283+
<ref role="37wK5l" to="wyt6:~Integer.parseInt(java.lang.String)" resolve="parseInt" />
284+
<node concept="1Wqviy" id="4Oomam7raES" role="37wK5m" />
285+
</node>
277286
</node>
278287
</node>
279288
<node concept="3cpWs6" id="7Wa2sv3Fmih" role="3cqZAp">
280-
<node concept="3clFbT" id="7Wa2sv3Fmix" role="3cqZAk">
281-
<property role="3clFbU" value="true" />
289+
<node concept="2d3UOw" id="3z1zSuyK3m5" role="3cqZAk">
290+
<node concept="3cmrfG" id="3z1zSuyK3nU" role="3uHU7w">
291+
<property role="3cmrfH" value="0" />
292+
</node>
293+
<node concept="37vLTw" id="3z1zSuyK1yd" role="3uHU7B">
294+
<ref role="3cqZAo" node="4Oomam7raEQ" resolve="prec" />
295+
</node>
282296
</node>
283297
</node>
284298
</node>

‎code/languages/org.iets3.opensource/tests/test.ts.expr.os/models/test/ts/expr/os/[email protected]‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
<import index="523r" ref="r:9c5c2614-fd32-4054-b6ea-f1ceb6bdd369(org.iets3.core.expr.util.typesystem)" />
2929
<import index="byea" ref="r:55ae05df-8f25-48f0-a826-0655584ce598(org.iets3.core.expr.adt.typesystem)" />
3030
<import index="rpit" ref="r:e29c70b2-feb7-465e-9534-7fdb395635c2(org.iets3.core.expr.data.typesystem)" />
31+
<import index="2e51" ref="r:e3651d26-951a-4ffc-9443-e8b8de452a77(org.iets3.core.expr.simpleTypes.constraints)" />
3132
<import index="pbu6" ref="r:83e946de-2a7f-4a4c-b3c9-4f671aa7f2db(org.iets3.core.expr.base.behavior)" implicit="true" />
3233
<import index="hm2y" ref="r:66e07cb4-a4b0-4bf3-a36d-5e9ed1ff1bd3(org.iets3.core.expr.base.structure)" implicit="true" />
3334
</imports>
@@ -49,6 +50,7 @@
4950
<child id="5476670926298698900" name="outputNodes" index="2lJPY$" />
5051
<child id="6626913010124294914" name="migration" index="3ea0P7" />
5152
</concept>
53+
<concept id="7691029917083831655" name="jetbrains.mps.lang.test.structure.UnknownRuleReference" flags="ng" index="2u4KIi" />
5254
<concept id="7691029917083872157" name="jetbrains.mps.lang.test.structure.IRuleReference" flags="ng" index="2u4UPC">
5355
<reference id="8333855927540250453" name="declaration" index="39XzEq" />
5456
</concept>
@@ -57,6 +59,9 @@
5759
<concept id="5097124989038916362" name="jetbrains.mps.lang.test.structure.TestInfo" flags="ng" index="2XOHcx">
5860
<property id="5097124989038916363" name="projectPath" index="2XOHcw" />
5961
</concept>
62+
<concept id="8333855927540283103" name="jetbrains.mps.lang.test.structure.NodeConstraintsErrorCheckOperation" flags="ng" index="39XrGg">
63+
<child id="8333855927548182241" name="errorRef" index="39rjcI" />
64+
</concept>
6065
<concept id="6626913010124185481" name="jetbrains.mps.lang.test.structure.MigrationReference" flags="ng" index="3ea_Bc">
6166
<reference id="6626913010124185482" name="migration" index="3ea_Bf" />
6267
</concept>
@@ -6477,6 +6482,31 @@
64776482
</node>
64786483
</node>
64796484
<node concept="_ixoA" id="63mrHUnQhdt" role="_iOnC" />
6485+
<node concept="2zPypq" id="3z1zSuyK0Pd" role="_iOnC">
6486+
<property role="TrG5h" value="negativePrecision" />
6487+
<node concept="mLuIC" id="3z1zSuyK0Zt" role="2zM23F">
6488+
<node concept="2gteS_" id="3z1zSuyK0ZD" role="2gteVg">
6489+
<property role="2gteVv" value="-2" />
6490+
<node concept="7CXmI" id="3z1zSuyKeqh" role="lGtFl">
6491+
<node concept="39XrGg" id="3z1zSuyKfkg" role="7EUXB">
6492+
<node concept="2u4KIi" id="3z1zSuyKfkh" role="39rjcI">
6493+
<ref role="39XzEq" to="2e51:7Wa2sv3FgRI" />
6494+
</node>
6495+
</node>
6496+
</node>
6497+
</node>
6498+
</node>
6499+
<node concept="1I1voI" id="3z1zSuyK15L" role="2zPyp_" />
6500+
<node concept="1z9TsT" id="3z1zSuyKlPg" role="lGtFl">
6501+
<node concept="OjmMv" id="3z1zSuyKlPh" role="1w35rA">
6502+
<node concept="19SGf9" id="3z1zSuyKlPi" role="OjmMu">
6503+
<node concept="19SUe$" id="3z1zSuyKlPj" role="19SJt6">
6504+
<property role="19SUeA" value="negative precision is not allowed" />
6505+
</node>
6506+
</node>
6507+
</node>
6508+
</node>
6509+
</node>
64806510
<node concept="_ixoA" id="63mrHUnQhdP" role="_iOnC" />
64816511
<node concept="7CXmI" id="63mrHUnQHi1" role="lGtFl">
64826512
<node concept="7OXhh" id="63mrHUnQHj6" role="7EUXB" />

0 commit comments

Comments
 (0)