Skip to content

Commit 85766c5

Browse files
arimerarimer
authored
Merge pull request #1435 from IETS3/merge/mps20232
Merge maintenance/mps20232 into maintenance/mps20241
2 parents 0e788e1 + 896e1bb commit 85766c5

File tree

4 files changed

+65
-5
lines changed

4 files changed

+65
-5
lines changed

‎CHANGELOG.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ The project does _not_ follow Semantic Versioning and the changes are documented
2525
- CI tests for InterpreterCoverageAssQuery which make use use the calculated coverage data
2626
- Solver: Add test infrastructure to ensure that errors computed by any solver are converted to editor messages properly.
2727
- Variability: APIs for FilterParams (configuration of filter&instantiate process) and skeleton tree data structure were extended
28+
- Warning for BangOp in case type is not OptionType
2829

2930

3031
## June 2025

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

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -276,6 +276,9 @@
276276
</concept>
277277
</language>
278278
<language id="7a5dda62-9140-4668-ab76-d5ed1746f2b2" name="jetbrains.mps.lang.typesystem">
279+
<concept id="1207055528241" name="jetbrains.mps.lang.typesystem.structure.WarningStatement" flags="nn" index="a7r0C">
280+
<child id="1207055552304" name="warningText" index="a7wSD" />
281+
</concept>
279282
<concept id="1766949807893567867" name="jetbrains.mps.lang.typesystem.structure.OverridesConceptFunction" flags="ig" index="bXqS6" />
280283
<concept id="1185788614172" name="jetbrains.mps.lang.typesystem.structure.NormalTypeClause" flags="ng" index="mw_s8">
281284
<child id="1185788644032" name="normalType" index="mwGJk" />
@@ -11144,5 +11147,46 @@
1114411147
</node>
1114511148
<node concept="3Tm1VV" id="3eH6BL2UU3s" role="1B3o_S" />
1114611149
</node>
11150+
<node concept="18kY7G" id="6rS$_kMPZL2">
11151+
<property role="TrG5h" value="check_BangOp" />
11152+
<node concept="3clFbS" id="6rS$_kMPZL3" role="18ibNy">
11153+
<node concept="3clFbJ" id="6rS$_kMQ0WU" role="3cqZAp">
11154+
<node concept="3fqX7Q" id="6rS$_kMQ2_Q" role="3clFbw">
11155+
<node concept="2OqwBi" id="6rS$_kMQ2_S" role="3fr31v">
11156+
<node concept="2OqwBi" id="6rS$_kMQ2_T" role="2Oq$k0">
11157+
<node concept="2OqwBi" id="6rS$_kMQ2_U" role="2Oq$k0">
11158+
<node concept="1YBJjd" id="6rS$_kMQ2_V" role="2Oq$k0">
11159+
<ref role="1YBMHb" node="6rS$_kMPZL5" resolve="bangOp" />
11160+
</node>
11161+
<node concept="3TrEf2" id="6rS$_kMQ2_W" role="2OqNvi">
11162+
<ref role="3Tt5mk" to="hm2y:3G_qVqIw4zp" resolve="expr" />
11163+
</node>
11164+
</node>
11165+
<node concept="3JvlWi" id="6rS$_kMQ2_X" role="2OqNvi" />
11166+
</node>
11167+
<node concept="1mIQ4w" id="6rS$_kMQ2_Y" role="2OqNvi">
11168+
<node concept="chp4Y" id="6rS$_kMQ2_Z" role="cj9EA">
11169+
<ref role="cht4Q" to="hm2y:2rOWEwsEjcg" resolve="OptionType" />
11170+
</node>
11171+
</node>
11172+
</node>
11173+
</node>
11174+
<node concept="3clFbS" id="6rS$_kMQ0WW" role="3clFbx">
11175+
<node concept="a7r0C" id="6rS$_kMQ2Ju" role="3cqZAp">
11176+
<node concept="Xl_RD" id="6rS$_kMQ2JB" role="a7wSD">
11177+
<property role="Xl_RC" value="Bang operator applied for an expression of a non-option type" />
11178+
</node>
11179+
<node concept="1YBJjd" id="6rS$_kMQ2UR" role="1urrMF">
11180+
<ref role="1YBMHb" node="6rS$_kMPZL5" resolve="bangOp" />
11181+
</node>
11182+
</node>
11183+
</node>
11184+
</node>
11185+
</node>
11186+
<node concept="1YaCAy" id="6rS$_kMPZL5" role="1YuTPh">
11187+
<property role="TrG5h" value="bangOp" />
11188+
<ref role="1YaFvo" to="hm2y:24Fec4173Us" resolve="BangOp" />
11189+
</node>
11190+
</node>
1114711191
</model>
1114811192

‎code/languages/org.iets3.opensource/tests/test.iets3.core.tracequery/models/test/iets3/core/tracequery/[email protected]‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
<use id="d4280a54-f6df-4383-aa41-d1b2bffa7eb1" name="com.mbeddr.core.base" version="6" />
88
<use id="be5191a9-3476-47ca-b2a7-a426623add55" name="org.iets3.core.assessment" version="-1" />
99
<use id="f47b95d4-5e73-4c04-9204-18076950153b" name="de.itemis.mps.compare" version="-1" />
10-
<use id="9eff3336-14d7-46c5-afe1-dcbad13c14c3" name="org.iets3.core.trace.test" version="0" />
1110
<use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
1211
<use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
12+
<use id="9eff3336-14d7-46c5-afe1-dcbad13c14c3" name="org.iets3.core.trace.test" version="0" />
1313
</languages>
1414
<imports>
1515
<import index="vs0r" ref="r:f7764ca4-8c75-4049-922b-08516400a727(com.mbeddr.core.base.structure)" />

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

Lines changed: 19 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@
4141
<import index="ym7l" ref="r:050f6d52-a81b-4b31-9a1c-531c1a04708e(org.iets3.core.expr.simpleTypes.typesystem)" />
4242
<import index="xfg9" ref="r:ac28053f-2041-47f6-806b-ecfaca05a64a(org.iets3.core.expr.base.runtime.runtime)" />
4343
<import index="h60k" ref="r:2ef874f0-eb83-423c-afd2-f0c0921489b8(org.iets3.core.expr.simpleTypes.migration)" />
44-
<import index="1ka" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.typechecking(MPS.Core/)" />
4544
<import index="cp9o" ref="r:df6d55ea-0ac0-4364-9581-8cb45ef224d6(test.ts.expr.os.plugin)" />
45+
<import index="1ka" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.typechecking(MPS.Core/)" />
4646
<import index="n0yb" ref="r:1fd78142-d7d8-42c9-9cbb-0609b1bc5311(org.iets3.core.expr.collections.typesystem)" implicit="true" />
4747
<import index="hm2y" ref="r:66e07cb4-a4b0-4bf3-a36d-5e9ed1ff1bd3(org.iets3.core.expr.base.structure)" implicit="true" />
4848
<import index="pbu6" ref="r:83e946de-2a7f-4a4c-b3c9-4f671aa7f2db(org.iets3.core.expr.base.behavior)" implicit="true" />
@@ -18698,9 +18698,7 @@
1869818698
<node concept="_iOnV" id="3N4k0eSJKEP" role="1qenE9">
1869918699
<property role="TrG5h" value="options" />
1870018700
<node concept="7CXmI" id="3N4k0eSJKJc" role="lGtFl">
18701-
<node concept="7OXhh" id="3N4k0eSJKJd" role="7EUXB">
18702-
<property role="G7GLP" value="true" />
18703-
</node>
18701+
<node concept="7OXhh" id="3N4k0eSJKJd" role="7EUXB" />
1870418702
</node>
1870518703
<node concept="2zPypq" id="3N4k0eSJPou" role="_iOnC">
1870618704
<property role="TrG5h" value="x" />
@@ -18864,6 +18862,23 @@
1886418862
</node>
1886518863
</node>
1886618864
</node>
18865+
<node concept="2zPypq" id="6rS$_kMYE5Q" role="_iOnC">
18866+
<property role="TrG5h" value="xDeOptedTwice" />
18867+
<node concept="wdKpt" id="6rS$_kMYGUP" role="2lDidJ">
18868+
<node concept="wdKpt" id="6rS$_kMYH78" role="2lDidJ">
18869+
<node concept="_emDc" id="6rS$_kMYGUt" role="2lDidJ">
18870+
<ref role="_emDf" node="3N4k0eSJPou" resolve="x" />
18871+
</node>
18872+
</node>
18873+
<node concept="7CXmI" id="4OZmL8HJRId" role="lGtFl">
18874+
<node concept="29bkU" id="4OZmL8HJS8e" role="7EUXB">
18875+
<node concept="2PQEqo" id="4OZmL8HJS8f" role="3lydCh">
18876+
<ref role="39XzEq" to="t4jv:6rS$_kMQ2Ju" />
18877+
</node>
18878+
</node>
18879+
</node>
18880+
</node>
18881+
</node>
1886718882
<node concept="_ixoA" id="24Fec41awem" role="_iOnC" />
1886818883
<node concept="_ixoA" id="3N4k0eSJWQ3" role="_iOnC" />
1886918884
</node>

0 commit comments

Comments
 (0)